You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2022/05/01 14:42:27 UTC

[hbase] branch branch-2 updated (191e9329443 -> 1a5b1b266cd)

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a change to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


    from 191e9329443 HBASE-26992 Brotli compressor has unexpected behavior during reinitialization (#4389)
     new 731da45b911 HBASE-26899 tweak pom and formatter
     new 1a5b1b266cd HBASE-26899 Run spotless:apply

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 RELEASENOTES.md                                    |  301 ++-
 bin/considerAsDead.sh                              |    8 +-
 bin/hbase-cleanup.sh                               |    6 +-
 bin/hbase-config.sh                                |    4 +-
 bin/master-backup.sh                               |    6 +-
 bin/regionservers.sh                               |    4 +-
 bin/stop-hbase.sh                                  |    4 +-
 bin/test/process_based_cluster.sh                  |    4 +-
 bin/zookeepers.sh                                  |    2 +-
 conf/hbase-env.sh                                  |   10 +-
 conf/hbase-policy.xml                              |   16 +-
 dev-support/HBase Code Template.xml                |    2 +-
 dev-support/HOW_TO_YETUS_LOCAL.md                  |    2 +-
 dev-support/hbase_eclipse_formatter.xml            |  690 ++---
 .../hbase_nightly_pseudo-distributed-test.sh       |   56 +-
 dev-support/hbasetests.sh                          |  106 +-
 dev-support/jenkinsEnv.sh                          |    1 -
 dev-support/make_rc.sh                             |    2 +-
 dev-support/rebase_all_git_branches.sh             |   22 +-
 dev-support/smart-apply-patch.sh                   |    2 +-
 dev-support/test-util.sh                           |    6 +-
 dev-support/zombie-detector.sh                     |    2 +-
 hbase-annotations/pom.xml                          |    4 +-
 .../hbase/testclassification/ClientTests.java      |    2 -
 .../hbase/testclassification/CoprocessorTests.java |    2 -
 .../hbase/testclassification/FilterTests.java      |    2 -
 .../hbase/testclassification/FlakeyTests.java      |    2 -
 .../hadoop/hbase/testclassification/IOTests.java   |    2 -
 .../hbase/testclassification/IntegrationTests.java |   17 +-
 .../hbase/testclassification/LargeTests.java       |   18 +-
 .../hbase/testclassification/MapReduceTests.java   |    2 -
 .../hbase/testclassification/MasterTests.java      |    2 -
 .../hbase/testclassification/MediumTests.java      |   17 +-
 .../hbase/testclassification/MetricsTests.java     |    1 -
 .../hadoop/hbase/testclassification/MiscTests.java |    2 -
 .../hadoop/hbase/testclassification/RPCTests.java  |    2 -
 .../testclassification/RegionServerTests.java      |    2 -
 .../hbase/testclassification/ReplicationTests.java |    2 -
 .../hadoop/hbase/testclassification/RestTests.java |    2 -
 .../hbase/testclassification/SecurityTests.java    |    2 -
 .../hbase/testclassification/SmallTests.java       |   14 +-
 .../testclassification/VerySlowMapReduceTests.java |    4 +-
 .../VerySlowRegionServerTests.java                 |    2 -
 .../hadoop/hbase/testclassification/ZKTests.java   |    1 -
 hbase-archetypes/hbase-archetype-builder/pom.xml   |   61 +-
 hbase-archetypes/hbase-client-project/pom.xml      |    7 +-
 .../archetypes/exemplars/client/HelloHBase.java    |  112 +-
 .../exemplars/client/TestHelloHBase.java           |   34 +-
 .../hbase-shaded-client-project/pom.xml            |   27 +-
 .../exemplars/shaded_client/HelloHBase.java        |  111 +-
 .../exemplars/shaded_client/TestHelloHBase.java    |   34 +-
 hbase-archetypes/pom.xml                           |    9 +-
 hbase-assembly/pom.xml                             |  335 ++-
 hbase-asyncfs/pom.xml                              |   69 +-
 .../hadoop/hbase/io/asyncfs/AsyncFSOutput.java     |    5 +-
 .../hbase/io/asyncfs/AsyncFSOutputHelper.java      |    8 +-
 .../io/asyncfs/FanOutOneBlockAsyncDFSOutput.java   |   40 +-
 .../FanOutOneBlockAsyncDFSOutputHelper.java        |  131 +-
 .../FanOutOneBlockAsyncDFSOutputSaslHelper.java    |  118 +-
 .../hadoop/hbase/io/asyncfs/ProtobufDecoder.java   |   58 +-
 .../hbase/io/asyncfs/SendBufSizePredictor.java     |    2 +-
 .../hbase/io/asyncfs/WrapperAsyncFSOutput.java     |    9 +-
 .../io/asyncfs/monitor/ExcludeDatanodeManager.java |   31 +-
 .../io/asyncfs/monitor/StreamSlowMonitor.java      |   70 +-
 .../hadoop/hbase/util/CancelableProgressable.java  |    9 +-
 .../hadoop/hbase/util/RecoverLeaseFSUtils.java     |   24 +-
 .../hadoop/hbase/io/asyncfs/AsyncFSTestBase.java   |    2 +-
 .../io/asyncfs/TestExcludeDatanodeManager.java     |   45 +-
 .../asyncfs/TestFanOutOneBlockAsyncDFSOutput.java  |    9 +-
 .../TestFanOutOneBlockAsyncDFSOutputHang.java      |    7 +-
 .../hbase/io/asyncfs/TestLocalAsyncOutput.java     |    2 +-
 .../TestOverwriteFileUnderConstruction.java        |    2 +-
 .../TestSaslFanOutOneBlockAsyncDFSOutput.java      |    4 +-
 .../hbase/io/asyncfs/TestSendBufSizePredictor.java |    4 +-
 .../hadoop/hbase/security/HBaseKerberosUtils.java  |    6 +-
 .../hadoop/hbase/util/TestRecoverLeaseFSUtils.java |    7 +-
 hbase-build-configuration/pom.xml                  |   32 +-
 hbase-checkstyle/pom.xml                           |   56 +-
 hbase-client/pom.xml                               |   59 +-
 .../java/org/apache/hadoop/hbase/Abortable.java    |   12 +-
 .../hadoop/hbase/AsyncMetaTableAccessor.java       |  171 +-
 .../apache/hadoop/hbase/CacheEvictionStats.java    |   18 +-
 .../hadoop/hbase/CacheEvictionStatsAggregator.java |    5 +-
 .../hadoop/hbase/CacheEvictionStatsBuilder.java    |    6 +-
 .../apache/hadoop/hbase/CallDroppedException.java  |    7 +-
 .../hadoop/hbase/CallQueueTooBigException.java     |    7 +-
 .../hadoop/hbase/ClockOutOfSyncException.java      |    7 +-
 .../java/org/apache/hadoop/hbase/ClusterId.java    |   25 +-
 .../org/apache/hadoop/hbase/ClusterMetrics.java    |   63 +-
 .../apache/hadoop/hbase/ClusterMetricsBuilder.java |  247 +-
 .../org/apache/hadoop/hbase/ClusterStatus.java     |  150 +-
 .../ConcurrentTableModificationException.java      |    3 +-
 .../java/org/apache/hadoop/hbase/Coprocessor.java  |   39 +-
 .../hadoop/hbase/CoprocessorEnvironment.java       |   18 +-
 .../apache/hadoop/hbase/DoNotRetryIOException.java |    5 +-
 .../hadoop/hbase/DroppedSnapshotException.java     |   21 +-
 ...iledCloseWALAfterInitializedErrorException.java |   22 +-
 .../apache/hadoop/hbase/HBaseServerException.java  |    6 +-
 .../org/apache/hadoop/hbase/HColumnDescriptor.java |  255 +-
 .../java/org/apache/hadoop/hbase/HRegionInfo.java  |  576 ++--
 .../org/apache/hadoop/hbase/HRegionLocation.java   |   36 +-
 .../org/apache/hadoop/hbase/HTableDescriptor.java  |  381 ++-
 .../hbase/InvalidFamilyOperationException.java     |    8 +-
 .../org/apache/hadoop/hbase/KeepDeletedCells.java  |   21 +-
 .../hadoop/hbase/MasterNotRunningException.java    |    4 +-
 .../hadoop/hbase/MemoryCompactionPolicy.java       |   16 +-
 .../org/apache/hadoop/hbase/MetaTableAccessor.java |  737 +++---
 .../hadoop/hbase/MultiActionResultTooLarge.java    |   11 +-
 .../hadoop/hbase/NamespaceExistException.java      |    3 +-
 .../hadoop/hbase/NamespaceNotFoundException.java   |    3 +-
 .../hbase/NotAllMetaRegionsOnlineException.java    |    7 +-
 .../hadoop/hbase/NotServingRegionException.java    |    4 +-
 .../apache/hadoop/hbase/PleaseHoldException.java   |   11 +-
 .../hadoop/hbase/PleaseRestartMasterException.java |    2 -
 .../apache/hadoop/hbase/RSGroupTableAccessor.java  |   20 +-
 .../org/apache/hadoop/hbase/RegionException.java   |    6 +-
 .../java/org/apache/hadoop/hbase/RegionLoad.java   |  156 +-
 .../org/apache/hadoop/hbase/RegionLocations.java   |  118 +-
 .../org/apache/hadoop/hbase/RegionMetrics.java     |   18 +-
 .../apache/hadoop/hbase/RegionMetricsBuilder.java  |  325 +--
 .../hadoop/hbase/RegionTooBusyException.java       |   13 +-
 .../hbase/ReplicationPeerNotFoundException.java    |    3 +-
 .../hadoop/hbase/RetryImmediatelyException.java    |    5 +-
 .../java/org/apache/hadoop/hbase/ServerLoad.java   |  217 +-
 .../org/apache/hadoop/hbase/ServerMetrics.java     |   11 +-
 .../apache/hadoop/hbase/ServerMetricsBuilder.java  |  124 +-
 .../java/org/apache/hadoop/hbase/ServerTask.java   |    2 +-
 .../org/apache/hadoop/hbase/ServerTaskBuilder.java |    7 +-
 .../main/java/org/apache/hadoop/hbase/Size.java    |   16 +-
 .../apache/hadoop/hbase/TableExistsException.java  |   13 +-
 .../hadoop/hbase/TableInfoMissingException.java    |    4 +-
 .../hadoop/hbase/TableNotDisabledException.java    |    3 +-
 .../hadoop/hbase/TableNotEnabledException.java     |    4 +-
 .../hadoop/hbase/TableNotFoundException.java       |    3 +-
 .../hadoop/hbase/UnknownRegionException.java       |    7 +-
 .../hadoop/hbase/UnknownScannerException.java      |   12 +-
 .../java/org/apache/hadoop/hbase/UserMetrics.java  |   14 +-
 .../apache/hadoop/hbase/UserMetricsBuilder.java    |   76 +-
 .../hadoop/hbase/ZooKeeperConnectionException.java |    7 +-
 .../hadoop/hbase/client/AbstractClientScanner.java |    4 +-
 .../hadoop/hbase/client/AbstractResponse.java      |    8 +-
 .../client/AbstractRpcBasedConnectionRegistry.java |    9 +-
 .../org/apache/hadoop/hbase/client/Action.java     |   15 +-
 .../java/org/apache/hadoop/hbase/client/Admin.java | 1550 +++++------
 .../hbase/client/AdvancedScanResultConsumer.java   |   14 +-
 .../hbase/client/AllowPartialScanResultCache.java  |    3 +-
 .../org/apache/hadoop/hbase/client/Append.java     |   80 +-
 .../org/apache/hadoop/hbase/client/AsyncAdmin.java |  478 ++--
 .../hadoop/hbase/client/AsyncAdminBuilder.java     |   15 +-
 .../hadoop/hbase/client/AsyncAdminBuilderBase.java |    3 +-
 .../client/AsyncAdminRequestRetryingCaller.java    |    6 +-
 .../hbase/client/AsyncBatchRpcRetryingCaller.java  |   41 +-
 .../hadoop/hbase/client/AsyncBufferedMutator.java  |    2 +-
 .../hbase/client/AsyncBufferedMutatorBuilder.java  |    3 +-
 .../client/AsyncBufferedMutatorBuilderImpl.java    |    4 +-
 .../hbase/client/AsyncBufferedMutatorImpl.java     |    9 +-
 .../hadoop/hbase/client/AsyncClientScanner.java    |   50 +-
 .../hadoop/hbase/client/AsyncConnection.java       |   10 +-
 .../hbase/client/AsyncConnectionConfiguration.java |   44 +-
 .../hadoop/hbase/client/AsyncConnectionImpl.java   |    8 +-
 .../hadoop/hbase/client/AsyncHBaseAdmin.java       |   80 +-
 .../AsyncMasterRequestRpcRetryingCaller.java       |   12 +-
 .../hbase/client/AsyncMetaRegionLocator.java       |    8 +-
 .../hbase/client/AsyncNonMetaRegionLocator.java    |   69 +-
 .../apache/hadoop/hbase/client/AsyncProcess.java   |  163 +-
 .../hadoop/hbase/client/AsyncProcessTask.java      |   39 +-
 .../hadoop/hbase/client/AsyncRegionLocator.java    |   79 +-
 .../hbase/client/AsyncRegionLocatorHelper.java     |   11 +-
 .../hadoop/hbase/client/AsyncRequestFuture.java    |    8 +-
 .../hbase/client/AsyncRequestFutureImpl.java       |  370 ++-
 .../hbase/client/AsyncRpcRetryingCaller.java       |   21 +-
 .../client/AsyncRpcRetryingCallerFactory.java      |   28 +-
 .../AsyncScanSingleRegionRpcRetryingCaller.java    |   58 +-
 .../AsyncServerRequestRpcRetryingCaller.java       |   14 +-
 .../AsyncSingleRequestRpcRetryingCaller.java       |   18 +-
 .../org/apache/hadoop/hbase/client/AsyncTable.java |   66 +-
 .../hadoop/hbase/client/AsyncTableBuilder.java     |   15 +-
 .../hadoop/hbase/client/AsyncTableBuilderBase.java |    8 +-
 .../apache/hadoop/hbase/client/AsyncTableImpl.java |   10 +-
 .../hbase/client/AsyncTableRegionLocator.java      |   12 +-
 .../hbase/client/AsyncTableRegionLocatorImpl.java  |    6 +-
 .../hbase/client/AsyncTableResultScanner.java      |    2 +-
 .../org/apache/hadoop/hbase/client/Attributes.java |   10 +-
 .../apache/hadoop/hbase/client/BalanceRequest.java |   37 +-
 .../hadoop/hbase/client/BalanceResponse.java       |   28 +-
 .../hadoop/hbase/client/BalancerDecision.java      |   29 +-
 .../hadoop/hbase/client/BalancerRejection.java     |   41 +-
 .../apache/hadoop/hbase/client/BatchErrors.java    |   14 +-
 .../hadoop/hbase/client/BatchScanResultCache.java  |   10 +-
 .../hadoop/hbase/client/BufferedMutator.java       |  114 +-
 .../hadoop/hbase/client/BufferedMutatorImpl.java   |  146 +-
 .../hadoop/hbase/client/BufferedMutatorParams.java |   32 +-
 .../apache/hadoop/hbase/client/Cancellable.java    |   10 +-
 .../client/CancellableRegionServerCallable.java    |   64 +-
 .../client/CatalogReplicaLoadBalanceSelector.java  |    7 +-
 .../CatalogReplicaLoadBalanceSelectorFactory.java  |    8 +-
 .../CatalogReplicaLoadBalanceSimpleSelector.java   |  110 +-
 .../hadoop/hbase/client/CatalogReplicaMode.java    |   26 +-
 .../apache/hadoop/hbase/client/CheckAndMutate.java |   36 +-
 .../hbase/client/ClientAsyncPrefetchScanner.java   |    8 +-
 .../client/ClientCoprocessorRpcController.java     |    3 +-
 .../hadoop/hbase/client/ClientIdGenerator.java     |   25 +-
 .../apache/hadoop/hbase/client/ClientScanner.java  |   38 +-
 .../hadoop/hbase/client/ClientServiceCallable.java |   37 +-
 .../hadoop/hbase/client/ClientSimpleScanner.java   |   18 +-
 .../org/apache/hadoop/hbase/client/ClientUtil.java |   25 +-
 .../hadoop/hbase/client/ClusterConnection.java     |  156 +-
 .../hadoop/hbase/client/ClusterStatusListener.java |   57 +-
 .../hbase/client/ColumnFamilyDescriptor.java       |  147 +-
 .../client/ColumnFamilyDescriptorBuilder.java      |  396 ++-
 .../apache/hadoop/hbase/client/CompactType.java    |   15 +-
 .../hadoop/hbase/client/CompactionState.java       |    7 +-
 .../hbase/client/CompleteScanResultCache.java      |    5 +-
 .../org/apache/hadoop/hbase/client/Connection.java |  149 +-
 .../hbase/client/ConnectionConfiguration.java      |  100 +-
 .../hadoop/hbase/client/ConnectionFactory.java     |   24 +-
 .../hbase/client/ConnectionImplementation.java     |  440 ++--
 .../hadoop/hbase/client/ConnectionRegistry.java    |    4 +-
 .../hbase/client/ConnectionRegistryFactory.java    |    1 +
 .../hadoop/hbase/client/ConnectionUtils.java       |   34 +-
 .../apache/hadoop/hbase/client/Consistency.java    |   31 +-
 .../hadoop/hbase/client/CoprocessorDescriptor.java |   11 +-
 .../hbase/client/CoprocessorDescriptorBuilder.java |    7 +-
 .../org/apache/hadoop/hbase/client/Cursor.java     |    9 +-
 .../apache/hadoop/hbase/client/DelayingRunner.java |   31 +-
 .../org/apache/hadoop/hbase/client/Delete.java     |  199 +-
 .../hbase/client/DoNotRetryRegionException.java    |    3 +-
 .../org/apache/hadoop/hbase/client/Durability.java |   23 +-
 .../apache/hadoop/hbase/client/FailureInfo.java    |   19 +-
 .../hbase/client/FastFailInterceptorContext.java   |    5 +-
 .../hadoop/hbase/client/FlushRegionCallable.java   |   25 +-
 .../java/org/apache/hadoop/hbase/client/Get.java   |  149 +-
 .../org/apache/hadoop/hbase/client/HBaseAdmin.java | 1825 +++++++------
 .../org/apache/hadoop/hbase/client/HBaseHbck.java  |   85 +-
 .../apache/hadoop/hbase/client/HRegionLocator.java |   75 +-
 .../org/apache/hadoop/hbase/client/HTable.java     |  572 ++--
 .../hadoop/hbase/client/HTableMultiplexer.java     |  135 +-
 .../java/org/apache/hadoop/hbase/client/Hbck.java  |   76 +-
 .../hbase/client/ImmutableHColumnDescriptor.java   |   12 +-
 .../hadoop/hbase/client/ImmutableHRegionInfo.java  |    7 +-
 .../hbase/client/ImmutableHTableDescriptor.java    |   12 +-
 .../apache/hadoop/hbase/client/ImmutableScan.java  |    3 -
 .../org/apache/hadoop/hbase/client/Increment.java  |  123 +-
 .../apache/hadoop/hbase/client/IsolationLevel.java |   22 +-
 .../hadoop/hbase/client/LockTimeoutException.java  |    3 +-
 .../org/apache/hadoop/hbase/client/LogEntry.java   |    6 +-
 .../apache/hadoop/hbase/client/LogQueryFilter.java |   43 +-
 .../apache/hadoop/hbase/client/MasterCallable.java |   45 +-
 .../client/MasterCoprocessorRpcChannelImpl.java    |   15 +-
 .../hbase/client/MasterKeepAliveConnection.java    |   25 +-
 .../apache/hadoop/hbase/client/MasterRegistry.java |    2 +-
 .../hadoop/hbase/client/MasterSwitchType.java      |    4 +-
 .../org/apache/hadoop/hbase/client/MetaCache.java  |   80 +-
 .../hadoop/hbase/client/MetricsConnection.java     |  183 +-
 .../hbase/client/MobCompactPartitionPolicy.java    |    1 -
 .../apache/hadoop/hbase/client/MultiAction.java    |   28 +-
 .../apache/hadoop/hbase/client/MultiResponse.java  |   35 +-
 .../hadoop/hbase/client/MultiServerCallable.java   |   27 +-
 .../hadoop/hbase/client/MutableRegionInfo.java     |   95 +-
 .../org/apache/hadoop/hbase/client/Mutation.java   |  365 ++-
 .../client/NoOpRetryableCallerInterceptor.java     |   23 +-
 .../client/NoOpRetryingInterceptorContext.java     |    2 +-
 .../hbase/client/NoServerForRegionException.java   |    3 +-
 .../apache/hadoop/hbase/client/NonceGenerator.java |   10 +-
 .../hbase/client/NoncedRegionServerCallable.java   |   36 +-
 .../hbase/client/NormalizeTableFilterParams.java   |   29 +-
 .../hadoop/hbase/client/OnlineLogRecord.java       |   87 +-
 .../org/apache/hadoop/hbase/client/Operation.java  |   45 +-
 .../hbase/client/OperationWithAttributes.java      |   28 +-
 .../hbase/client/PackagePrivateFieldAccessor.java  |    2 +-
 .../client/PerClientRandomNonceGenerator.java      |    7 +-
 .../client/PreemptiveFastFailInterceptor.java      |  177 +-
 .../java/org/apache/hadoop/hbase/client/Put.java   |  153 +-
 .../java/org/apache/hadoop/hbase/client/Query.java |  102 +-
 .../hadoop/hbase/client/RawAsyncHBaseAdmin.java    | 1308 +++++----
 .../hadoop/hbase/client/RawAsyncTableImpl.java     |  292 +--
 .../hbase/client/RegionAdminServiceCallable.java   |   57 +-
 .../hbase/client/RegionCoprocessorRpcChannel.java  |   52 +-
 .../client/RegionCoprocessorRpcChannelImpl.java    |   36 +-
 .../hbase/client/RegionCoprocessorServiceExec.java |   39 +-
 .../org/apache/hadoop/hbase/client/RegionInfo.java |  373 ++-
 .../hadoop/hbase/client/RegionInfoBuilder.java     |   14 +-
 .../hadoop/hbase/client/RegionInfoDisplay.java     |   45 +-
 .../hadoop/hbase/client/RegionLoadStats.java       |    6 +-
 .../hadoop/hbase/client/RegionLocateType.java      |    6 +-
 .../apache/hadoop/hbase/client/RegionLocator.java  |   23 +-
 .../hbase/client/RegionOfflineException.java       |    4 +-
 .../hadoop/hbase/client/RegionReplicaUtil.java     |   67 +-
 .../hadoop/hbase/client/RegionServerCallable.java  |  100 +-
 .../RegionServerCoprocessorRpcChannelImpl.java     |   15 +-
 .../hadoop/hbase/client/RegionStatesCount.java     |    4 +-
 .../hbase/client/RegistryEndpointsRefresher.java   |    4 +-
 .../hadoop/hbase/client/RequestController.java     |   45 +-
 .../hbase/client/RequestControllerFactory.java     |   10 +-
 .../org/apache/hadoop/hbase/client/Result.java     |  565 ++--
 .../client/ResultBoundedCompletionService.java     |   79 +-
 .../hadoop/hbase/client/ResultStatsUtil.java       |   11 +-
 .../hbase/client/RetriesExhaustedException.java    |   37 +-
 .../RetriesExhaustedWithDetailsException.java      |   44 +-
 .../hadoop/hbase/client/RetryingCallable.java      |   24 +-
 .../hbase/client/RetryingCallerInterceptor.java    |   66 +-
 .../client/RetryingCallerInterceptorContext.java   |   40 +-
 .../client/RetryingCallerInterceptorFactory.java   |   45 +-
 .../hadoop/hbase/client/RetryingTimeTracker.java   |   21 +-
 .../hadoop/hbase/client/ReversedClientScanner.java |   40 +-
 .../hbase/client/ReversedScannerCallable.java      |   93 +-
 .../java/org/apache/hadoop/hbase/client/Row.java   |    8 +-
 .../org/apache/hadoop/hbase/client/RowAccess.java  |    7 +-
 .../apache/hadoop/hbase/client/RowMutations.java   |   57 +-
 .../hadoop/hbase/client/RowTooBigException.java    |    9 +-
 .../hadoop/hbase/client/RpcConnectionRegistry.java |    4 +-
 .../hadoop/hbase/client/RpcRetryingCallable.java   |    3 +-
 .../hadoop/hbase/client/RpcRetryingCaller.java     |   22 +-
 .../hbase/client/RpcRetryingCallerFactory.java     |   38 +-
 .../hadoop/hbase/client/RpcRetryingCallerImpl.java |   77 +-
 .../client/RpcRetryingCallerWithReadReplicas.java  |  119 +-
 .../java/org/apache/hadoop/hbase/client/Scan.java  |  431 ++-
 .../hadoop/hbase/client/ScanResultCache.java       |    5 +-
 .../hadoop/hbase/client/ScanResultConsumer.java    |    2 +-
 .../hbase/client/ScanResultConsumerBase.java       |    2 +-
 .../hadoop/hbase/client/ScannerCallable.java       |   74 +-
 .../hbase/client/ScannerCallableWithReplicas.java  |  106 +-
 .../hadoop/hbase/client/SecureBulkLoadClient.java  |  109 +-
 .../hbase/client/ServerStatisticTracker.java       |    8 +-
 .../org/apache/hadoop/hbase/client/ServerType.java |    8 +-
 .../apache/hadoop/hbase/client/ServiceCaller.java  |    7 +-
 .../hbase/client/ShortCircuitMasterConnection.java |  197 +-
 .../hbase/client/SimpleRequestController.java      |  145 +-
 .../apache/hadoop/hbase/client/SingleResponse.java |    3 +-
 .../apache/hadoop/hbase/client/SlowLogParams.java  |   19 +-
 .../hadoop/hbase/client/SnapshotDescription.java   |   54 +-
 .../apache/hadoop/hbase/client/SnapshotType.java   |    6 +-
 .../hadoop/hbase/client/StatisticTrackable.java    |   19 +-
 .../hbase/client/SyncCoprocessorRpcChannel.java    |   33 +-
 .../java/org/apache/hadoop/hbase/client/Table.java |  629 ++---
 .../apache/hadoop/hbase/client/TableBuilder.java   |    5 +-
 .../hadoop/hbase/client/TableBuilderBase.java      |    7 +-
 .../hadoop/hbase/client/TableDescriptor.java       |  137 +-
 .../hbase/client/TableDescriptorBuilder.java       |  556 ++--
 .../hadoop/hbase/client/TableDescriptorUtils.java  |   11 +-
 .../org/apache/hadoop/hbase/client/TableState.java |   96 +-
 .../hbase/client/UnmodifyableHRegionInfo.java      |    8 +-
 .../hadoop/hbase/client/ZKConnectionRegistry.java  |   18 +-
 .../hbase/client/backoff/ClientBackoffPolicy.java  |    9 +-
 .../client/backoff/ClientBackoffPolicyFactory.java |   13 +-
 .../backoff/ExponentialClientBackoffPolicy.java    |   22 +-
 .../hbase/client/backoff/ServerStatistics.java     |   23 +-
 .../hadoop/hbase/client/coprocessor/Batch.java     |   37 +-
 .../coprocessor/BigDecimalColumnInterpreter.java   |   28 +-
 .../coprocessor/DoubleColumnInterpreter.java       |   41 +-
 .../client/coprocessor/LongColumnInterpreter.java  |   35 +-
 .../hadoop/hbase/client/metrics/ScanMetrics.java   |   28 +-
 .../client/metrics/ServerSideScanMetrics.java      |   31 +-
 .../hbase/client/replication/ReplicationAdmin.java |  168 +-
 .../replication/ReplicationPeerConfigUtil.java     |  152 +-
 .../hadoop/hbase/client/replication/TableCFs.java  |    8 +-
 .../hbase/client/security/SecurityCapability.java  |   18 +-
 .../hbase/client/trace/ConnectionSpanBuilder.java  |   43 +-
 .../hbase/client/trace/IpcClientSpanBuilder.java   |   19 +-
 .../client/trace/TableOperationSpanBuilder.java    |   37 +-
 .../hbase/client/trace/TableSpanBuilder.java       |   13 +-
 .../hbase/coprocessor/ColumnInterpreter.java       |  127 +-
 .../hbase/coprocessor/CoprocessorException.java    |    9 +-
 .../hbase/exceptions/ClientExceptionsUtil.java     |   30 +-
 .../exceptions/ConnectionClosedException.java      |    5 +-
 .../exceptions/ConnectionClosingException.java     |   16 +-
 .../exceptions/FailedSanityCheckException.java     |    7 +-
 .../exceptions/MasterRegistryFetchException.java   |    2 +-
 .../hbase/exceptions/MasterStoppedException.java   |    2 +-
 .../hbase/exceptions/MergeRegionException.java     |    6 +-
 .../exceptions/OutOfOrderScannerNextException.java |    2 +-
 .../exceptions/PreemptiveFastFailException.java    |   64 +-
 .../hbase/exceptions/RegionMovedException.java     |   24 +-
 .../hbase/exceptions/RegionOpeningException.java   |    5 +-
 .../hbase/exceptions/RequestTooBigException.java   |    8 +-
 .../hbase/exceptions/ScannerResetException.java    |    3 +-
 .../hbase/exceptions/UnknownProtocolException.java |    6 +-
 .../hadoop/hbase/filter/BigDecimalComparator.java  |   20 +-
 .../hadoop/hbase/filter/BinaryComparator.java      |   31 +-
 .../hbase/filter/BinaryComponentComparator.java    |   33 +-
 .../hbase/filter/BinaryPrefixComparator.java       |   35 +-
 .../apache/hadoop/hbase/filter/BitComparator.java  |   49 +-
 .../hadoop/hbase/filter/ColumnCountGetFilter.java  |   33 +-
 .../hbase/filter/ColumnPaginationFilter.java       |  105 +-
 .../hadoop/hbase/filter/ColumnPrefixFilter.java    |   48 +-
 .../hadoop/hbase/filter/ColumnRangeFilter.java     |   99 +-
 .../hadoop/hbase/filter/ColumnValueFilter.java     |   65 +-
 .../apache/hadoop/hbase/filter/CompareFilter.java  |  137 +-
 .../hadoop/hbase/filter/DependentColumnFilter.java |  177 +-
 .../apache/hadoop/hbase/filter/FamilyFilter.java   |   74 +-
 .../org/apache/hadoop/hbase/filter/Filter.java     |  180 +-
 .../org/apache/hadoop/hbase/filter/FilterBase.java |   77 +-
 .../org/apache/hadoop/hbase/filter/FilterList.java |   31 +-
 .../apache/hadoop/hbase/filter/FilterListBase.java |    8 +-
 .../hadoop/hbase/filter/FilterListWithAND.java     |   28 +-
 .../hadoop/hbase/filter/FilterListWithOR.java      |  230 +-
 .../hadoop/hbase/filter/FirstKeyOnlyFilter.java    |   30 +-
 .../FirstKeyValueMatchingQualifiersFilter.java     |   47 +-
 .../apache/hadoop/hbase/filter/FuzzyRowFilter.java |   97 +-
 .../hadoop/hbase/filter/InclusiveStopFilter.java   |   57 +-
 .../hbase/filter/IncompatibleFilterException.java  |    5 +-
 .../hbase/filter/InvalidRowFilterException.java    |    4 +-
 .../apache/hadoop/hbase/filter/KeyOnlyFilter.java  |   47 +-
 .../apache/hadoop/hbase/filter/LongComparator.java |   77 +-
 .../hadoop/hbase/filter/MultiRowRangeFilter.java   |  256 +-
 .../hbase/filter/MultipleColumnPrefixFilter.java   |   97 +-
 .../apache/hadoop/hbase/filter/NullComparator.java |   34 +-
 .../org/apache/hadoop/hbase/filter/PageFilter.java |   44 +-
 .../apache/hadoop/hbase/filter/ParseConstants.java |   52 +-
 .../apache/hadoop/hbase/filter/ParseFilter.java    |  738 +++---
 .../apache/hadoop/hbase/filter/PrefixFilter.java   |   45 +-
 .../hadoop/hbase/filter/QualifierFilter.java       |   59 +-
 .../hadoop/hbase/filter/RandomRowFilter.java       |   38 +-
 .../hadoop/hbase/filter/RegexStringComparator.java |  116 +-
 .../org/apache/hadoop/hbase/filter/RowFilter.java  |   65 +-
 .../filter/SingleColumnValueExcludeFilter.java     |  173 +-
 .../hbase/filter/SingleColumnValueFilter.java      |  283 +-
 .../org/apache/hadoop/hbase/filter/SkipFilter.java |   47 +-
 .../hadoop/hbase/filter/SubstringComparator.java   |   41 +-
 .../hadoop/hbase/filter/TimestampsFilter.java      |   70 +-
 .../apache/hadoop/hbase/filter/ValueFilter.java    |   63 +-
 .../hadoop/hbase/filter/WhileMatchFilter.java      |   30 +-
 .../apache/hadoop/hbase/ipc/AbstractRpcClient.java |   94 +-
 .../apache/hadoop/hbase/ipc/BadAuthException.java  |    2 +-
 .../hadoop/hbase/ipc/BlockingRpcCallback.java      |   20 +-
 .../apache/hadoop/hbase/ipc/BlockingRpcClient.java |    8 +-
 .../hadoop/hbase/ipc/BlockingRpcConnection.java    |  101 +-
 .../hbase/ipc/BufferCallBeforeInitHandler.java     |   20 +-
 .../java/org/apache/hadoop/hbase/ipc/Call.java     |   25 +-
 .../hadoop/hbase/ipc/CallCancelledException.java   |    2 +-
 .../org/apache/hadoop/hbase/ipc/CallEvent.java     |    5 +-
 .../hadoop/hbase/ipc/CallTimeoutException.java     |    5 +-
 .../hbase/ipc/CallerDisconnectedException.java     |    9 +-
 .../apache/hadoop/hbase/ipc/CellBlockBuilder.java  |   76 +-
 .../hbase/ipc/CellScannerButNoCodecException.java  |    2 +-
 .../org/apache/hadoop/hbase/ipc/ConnectionId.java  |   20 +-
 .../hadoop/hbase/ipc/CoprocessorRpcChannel.java    |   12 +-
 .../hadoop/hbase/ipc/CoprocessorRpcUtils.java      |  147 +-
 .../hbase/ipc/DelegatingHBaseRpcController.java    |    9 +-
 .../hadoop/hbase/ipc/FailedServerException.java    |    9 +-
 .../org/apache/hadoop/hbase/ipc/FailedServers.java |   17 +-
 .../hbase/ipc/FallbackDisallowedException.java     |    4 +-
 .../hadoop/hbase/ipc/FatalConnectionException.java |    7 +-
 .../hadoop/hbase/ipc/HBaseRpcController.java       |   15 +-
 .../hadoop/hbase/ipc/HBaseRpcControllerImpl.java   |   14 +-
 .../java/org/apache/hadoop/hbase/ipc/IPCUtil.java  |   78 +-
 .../apache/hadoop/hbase/ipc/NettyRpcClient.java    |    9 +-
 .../hbase/ipc/NettyRpcClientConfigHelper.java      |   13 +-
 .../hadoop/hbase/ipc/NettyRpcConnection.java       |    2 +-
 .../hadoop/hbase/ipc/NettyRpcDuplexHandler.java    |   16 +-
 .../hbase/ipc/RemoteWithExtrasException.java       |   22 +-
 .../org/apache/hadoop/hbase/ipc/RpcClient.java     |   41 +-
 .../apache/hadoop/hbase/ipc/RpcClientFactory.java  |   23 +-
 .../org/apache/hadoop/hbase/ipc/RpcConnection.java |   20 +-
 .../hadoop/hbase/ipc/RpcControllerFactory.java     |   11 +-
 .../hbase/ipc/ServerNotRunningYetException.java    |    3 -
 .../hadoop/hbase/ipc/ServerRpcController.java      |   25 +-
 .../hadoop/hbase/ipc/ServerTooBusyException.java   |    2 -
 .../hbase/ipc/StoppedRpcClientException.java       |    2 +-
 .../hbase/ipc/UnsupportedCellCodecException.java   |    2 +-
 .../ipc/UnsupportedCompressionCodecException.java  |    2 +-
 .../hbase/ipc/UnsupportedCryptoException.java      |    3 +-
 .../hadoop/hbase/ipc/WrongVersionException.java    |    2 +-
 .../apache/hadoop/hbase/master/RegionState.java    |   79 +-
 .../hadoop/hbase/protobuf/ProtobufMagic.java       |   30 +-
 .../hbase/protobuf/ProtobufMessageConverter.java   |   33 +-
 .../apache/hadoop/hbase/protobuf/ProtobufUtil.java |  778 +++---
 .../hbase/quotas/QuotaExceededException.java       |    3 +-
 .../apache/hadoop/hbase/quotas/QuotaFilter.java    |    3 +-
 .../apache/hadoop/hbase/quotas/QuotaRetriever.java |   26 +-
 .../org/apache/hadoop/hbase/quotas/QuotaScope.java |   15 +-
 .../apache/hadoop/hbase/quotas/QuotaSettings.java  |   79 +-
 .../hadoop/hbase/quotas/QuotaSettingsFactory.java  |  226 +-
 .../apache/hadoop/hbase/quotas/QuotaTableUtil.java |  351 +--
 .../org/apache/hadoop/hbase/quotas/QuotaType.java  |    2 +-
 .../hbase/quotas/RpcThrottlingException.java       |   70 +-
 .../hadoop/hbase/quotas/SpaceLimitSettings.java    |   80 +-
 .../hadoop/hbase/quotas/SpaceQuotaSnapshot.java    |   43 +-
 .../hbase/quotas/SpaceQuotaSnapshotView.java       |    2 +-
 .../hadoop/hbase/quotas/SpaceViolationPolicy.java  |   22 +-
 .../hadoop/hbase/quotas/ThrottleSettings.java      |   31 +-
 .../apache/hadoop/hbase/quotas/ThrottleType.java   |    2 +-
 .../hadoop/hbase/quotas/ThrottlingException.java   |   62 +-
 .../hadoop/hbase/regionserver/BloomType.java       |    4 +-
 .../hadoop/hbase/regionserver/LeaseException.java  |    5 +-
 .../regionserver/NoSuchColumnFamilyException.java  |    3 +-
 .../regionserver/RegionServerAbortedException.java |    3 +-
 .../regionserver/RegionServerRunningException.java |    8 +-
 .../regionserver/RegionServerStoppedException.java |    4 +-
 .../hbase/regionserver/WrongRegionException.java   |    4 +-
 .../regionserver/wal/FailedLogCloseException.java  |   10 +-
 .../wal/FailedSyncBeforeLogCloseException.java     |    9 +-
 .../hbase/replication/ReplicationException.java    |    4 +-
 .../hbase/replication/ReplicationLoadSink.java     |   30 +-
 .../hbase/replication/ReplicationLoadSource.java   |   45 +-
 .../hbase/replication/ReplicationPeerConfig.java   |   48 +-
 .../replication/ReplicationPeerConfigBuilder.java  |   31 +-
 .../replication/ReplicationPeerDescription.java    |    2 +-
 .../hbase/security/AbstractHBaseSaslRpcClient.java |   49 +-
 .../hbase/security/AccessDeniedException.java      |    5 +-
 .../apache/hadoop/hbase/security/AuthMethod.java   |    9 +-
 .../hbase/security/CryptoAESUnwrapHandler.java     |    8 +-
 .../hbase/security/CryptoAESWrapHandler.java       |   11 +-
 .../hadoop/hbase/security/EncryptionUtil.java      |  126 +-
 .../hadoop/hbase/security/HBaseSaslRpcClient.java  |   47 +-
 .../NettyHBaseRpcConnectionHeaderHandler.java      |   19 +-
 .../hbase/security/NettyHBaseSaslRpcClient.java    |   14 +-
 .../security/NettyHBaseSaslRpcClientHandler.java   |   41 +-
 .../hbase/security/SaslChallengeDecoder.java       |   21 +-
 .../apache/hadoop/hbase/security/SaslStatus.java   |    9 +-
 .../hadoop/hbase/security/SaslUnwrapHandler.java   |    9 +-
 .../org/apache/hadoop/hbase/security/SaslUtil.java |   17 +-
 .../hadoop/hbase/security/SaslWrapHandler.java     |    6 +-
 .../apache/hadoop/hbase/security/SecurityInfo.java |   20 +-
 .../hbase/security/access/AccessControlClient.java |  235 +-
 .../security/access/AccessControlConstants.java    |    9 +-
 .../hbase/security/access/AccessControlUtil.java   |  536 ++--
 .../security/access/GetUserPermissionsRequest.java |    5 +-
 .../hbase/security/access/GlobalPermission.java    |    3 +-
 .../hbase/security/access/NamespacePermission.java |    8 +-
 .../hadoop/hbase/security/access/Permission.java   |   66 +-
 .../security/access/ShadedAccessControlUtil.java   |   67 +-
 .../hbase/security/access/TablePermission.java     |   50 +-
 .../hbase/security/access/UserPermission.java      |   13 +-
 .../AbstractSaslClientAuthenticationProvider.java  |    5 +-
 .../provider/AuthenticationProviderSelector.java   |   11 +-
 .../security/provider/BuiltInProviderSelector.java |   49 +-
 .../BuiltInSaslAuthenticationProvider.java         |    5 +-
 .../provider/DigestSaslAuthenticationProvider.java |    4 +-
 .../DigestSaslClientAuthenticationProvider.java    |   12 +-
 .../provider/GssSaslAuthenticationProvider.java    |    4 +-
 .../GssSaslClientAuthenticationProvider.java       |   29 +-
 .../hbase/security/provider/SaslAuthMethod.java    |   17 +-
 .../provider/SaslAuthenticationProvider.java       |   12 +-
 .../provider/SaslClientAuthenticationProvider.java |   41 +-
 .../SaslClientAuthenticationProviders.java         |   77 +-
 .../provider/SimpleSaslAuthenticationProvider.java |    4 +-
 .../SimpleSaslClientAuthenticationProvider.java    |   10 +-
 .../token/AuthenticationTokenIdentifier.java       |   45 +-
 .../token/AuthenticationTokenSelector.java         |   23 +-
 .../hbase/security/token/ClientTokenUtil.java      |   49 +-
 .../hbase/security/visibility/Authorizations.java  |    8 +-
 .../hbase/security/visibility/CellVisibility.java  |   21 +-
 .../security/visibility/InvalidLabelException.java |    1 -
 .../security/visibility/VisibilityClient.java      |  297 +--
 .../security/visibility/VisibilityConstants.java   |   20 +-
 .../VisibilityControllerNotReadyException.java     |    3 +-
 .../visibility/VisibilityLabelsValidator.java      |    3 +-
 .../hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 1837 ++++++-------
 .../hbase/shaded/protobuf/RequestConverter.java    |  930 +++----
 .../hbase/shaded/protobuf/ResponseConverter.java   |  172 +-
 .../hadoop/hbase/slowlog/SlowLogTableAccessor.java |   33 +-
 .../snapshot/ClientSnapshotDescriptionUtils.java   |   25 +-
 .../hbase/snapshot/CorruptedSnapshotException.java |   11 +-
 .../hbase/snapshot/ExportSnapshotException.java    |    4 +-
 .../hbase/snapshot/HBaseSnapshotException.java     |   16 +-
 .../hbase/snapshot/RestoreSnapshotException.java   |   12 +-
 .../hbase/snapshot/SnapshotCreationException.java  |   16 +-
 .../snapshot/SnapshotDoesNotExistException.java    |    4 +-
 .../hbase/snapshot/SnapshotExistsException.java    |    6 +-
 .../snapshot/TablePartiallyOpenException.java      |    3 +-
 .../hbase/snapshot/UnknownSnapshotException.java   |    4 +-
 .../hbase/util/FileSystemVersionException.java     |    5 +-
 .../org/apache/hadoop/hbase/util/JsonMapper.java   |    2 +-
 .../java/org/apache/hadoop/hbase/util/PoolMap.java |  129 +-
 .../org/apache/hadoop/hbase/util/Writables.java    |   75 +-
 .../hadoop/hbase/zookeeper/ReadOnlyZKClient.java   |   17 +-
 .../apache/hadoop/hbase/zookeeper/ZKMetadata.java  |    3 +-
 .../apache/hadoop/hbase/zookeeper/ZNodePaths.java  |   70 +-
 .../hadoop/hbase/zookeeper/ZooKeeperHelper.java    |   19 +-
 .../apache/hadoop/hbase/TestHColumnDescriptor.java |   42 +-
 .../apache/hadoop/hbase/TestHTableDescriptor.java  |   46 +-
 .../apache/hadoop/hbase/TestRegionLocations.java   |   14 +-
 .../hbase/client/RpcRetryingCallerImplTest.java    |   36 +-
 .../hbase/client/TestAsyncAdminRpcPriority.java    |    2 +-
 .../client/TestAsyncConnectionConfiguration.java   |    3 +-
 .../hbase/client/TestAsyncConnectionTracing.java   |   13 +-
 .../hadoop/hbase/client/TestAsyncProcess.java      |  489 ++--
 .../TestAsyncProcessWithRegionException.java       |   53 +-
 .../client/TestAsyncRegionLocatorTracing.java      |   58 +-
 .../hbase/client/TestAsyncTableRpcPriority.java    |   41 +-
 .../hadoop/hbase/client/TestAsyncTableTracing.java |  140 +-
 .../apache/hadoop/hbase/client/TestAttributes.java |   35 +-
 .../hadoop/hbase/client/TestBufferedMutator.java   |   16 +-
 .../hbase/client/TestBufferedMutatorParams.java    |   46 +-
 .../hbase/client/TestClientExponentialBackoff.java |   44 +-
 .../hadoop/hbase/client/TestClientNoCluster.java   |  313 ++-
 .../hadoop/hbase/client/TestClientScanner.java     |  192 +-
 .../client/TestColumnFamilyDescriptorBuilder.java  |   51 +-
 .../TestColumnFamilyDescriptorLowerCaseEnum.java   |    4 +-
 .../hbase/client/TestConnectionConfiguration.java  |    4 +-
 .../hbase/client/TestConnectionFactoryTracing.java |    2 +
 .../TestConnectionImplementationTracing.java       |    1 +
 .../hbase/client/TestConnectionRegistryLeak.java   |    4 +-
 .../hbase/client/TestCoprocessorDescriptor.java    |   17 +-
 .../hadoop/hbase/client/TestDelayingRunner.java    |   13 +-
 .../hadoop/hbase/client/TestDeleteTimeStamp.java   |    9 +-
 .../org/apache/hadoop/hbase/client/TestGet.java    |   84 +-
 .../client/TestHTableMultiplexerViaMocks.java      |   10 +-
 .../hadoop/hbase/client/TestHTableTracing.java     |  130 +-
 .../client/TestImmutableHColumnDescriptor.java     |   49 +-
 .../hbase/client/TestImmutableHRegionInfo.java     |   14 +-
 .../client/TestImmutableHTableDescriptor.java      |   58 +-
 .../hadoop/hbase/client/TestImmutableScan.java     |   64 +-
 .../apache/hadoop/hbase/client/TestIncrement.java  |   16 +-
 .../hadoop/hbase/client/TestInterfaceAlign.java    |    2 +-
 .../hadoop/hbase/client/TestMetricsConnection.java |  103 +-
 .../apache/hadoop/hbase/client/TestMutation.java   |  102 +-
 .../apache/hadoop/hbase/client/TestOperation.java  |  308 +--
 .../hadoop/hbase/client/TestProcedureFuture.java   |   50 +-
 .../apache/hadoop/hbase/client/TestPutDotHas.java  |    9 +-
 .../hadoop/hbase/client/TestPutWriteToWal.java     |   13 +-
 .../hadoop/hbase/client/TestRegionInfoBuilder.java |    4 +-
 .../hadoop/hbase/client/TestRegionInfoDisplay.java |   67 +-
 .../hbase/client/TestRegionLocatorTracing.java     |   51 +-
 .../hadoop/hbase/client/TestResultStatsUtil.java   |   23 +-
 .../TestRetriesExhaustedWithDetailsException.java  |   11 +-
 .../hbase/client/TestReversedScannerCallable.java  |   20 +-
 .../hadoop/hbase/client/TestRowComparator.java     |   13 +-
 .../client/TestRpcBasedRegistryHedgedReads.java    |    5 +-
 .../hbase/client/TestRpcRetryingCallerImpl.java    |    8 +-
 .../org/apache/hadoop/hbase/client/TestScan.java   |   97 +-
 .../hadoop/hbase/client/TestScannerCallable.java   |   12 +-
 .../hbase/client/TestSimpleRequestController.java  |   53 +-
 .../hbase/client/TestTableDescriptorBuilder.java   |  185 +-
 .../hbase/client/TestTableDescriptorUtils.java     |   33 +-
 .../hadoop/hbase/client/TestTableRpcPriority.java  |   31 +-
 .../hadoop/hbase/client/TestTracingBase.java       |   30 +-
 .../hbase/client/trace/StringTraceRenderer.java    |   31 +-
 .../client/trace/hamcrest/AttributesMatchers.java  |   41 +-
 .../hbase/client/trace/hamcrest/EventMatchers.java |   14 +-
 .../client/trace/hamcrest/SpanDataMatchers.java    |   20 +-
 .../hbase/client/trace/hamcrest/TraceTestUtil.java |   22 +-
 .../hbase/exceptions/TestClientExceptionsUtil.java |    4 +-
 .../hadoop/hbase/filter/TestComparators.java       |   58 +-
 .../hadoop/hbase/filter/TestKeyOnlyFilter.java     |   35 +-
 .../hadoop/hbase/filter/TestLongComparator.java    |   10 +-
 .../hadoop/hbase/ipc/TestCellBlockBuilder.java     |   30 +-
 .../apache/hadoop/hbase/ipc/TestConnectionId.java  |   25 +-
 .../hadoop/hbase/ipc/TestFailedServersLog.java     |    6 +-
 .../hbase/ipc/TestHBaseRpcControllerImpl.java      |    4 +-
 .../org/apache/hadoop/hbase/ipc/TestIPCUtil.java   |   23 +-
 .../hadoop/hbase/ipc/TestNettyRpcConnection.java   |    2 +-
 .../hbase/ipc/TestRemoteWithExtrasException.java   |   14 +-
 .../ipc/TestRpcClientDeprecatedNameMapping.java    |    4 +-
 .../hadoop/hbase/quotas/TestQuotaFilter.java       |   21 +-
 .../quotas/TestQuotaGlobalsSettingsBypass.java     |   37 +-
 .../hbase/quotas/TestQuotaSettingsFactory.java     |   52 +-
 .../hbase/quotas/TestSpaceLimitSettings.java       |   24 +-
 .../hadoop/hbase/quotas/TestThrottleSettings.java  |   38 +-
 .../replication/TestReplicationPeerConfig.java     |  140 +-
 .../hadoop/hbase/security/TestEncryptionUtil.java  |   23 +-
 .../hbase/security/TestHBaseSaslRpcClient.java     |  124 +-
 .../apache/hadoop/hbase/security/TestSaslUtil.java |    6 +-
 .../provider/TestDefaultProviderSelector.java      |   12 +-
 .../TestSaslClientAuthenticationProviders.java     |   61 +-
 .../hbase/security/token/TestClientTokenUtil.java  |    6 +-
 .../hbase/shaded/protobuf/TestProtobufUtil.java    |  173 +-
 .../apache/hadoop/hbase/util/BuilderStyleTest.java |   39 +-
 .../apache/hadoop/hbase/util/PoolMapTestBase.java  |   10 +-
 .../hadoop/hbase/util/TestRoundRobinPoolMap.java   |    4 +-
 .../hadoop/hbase/util/TestThreadLocalPoolMap.java  |    4 +-
 .../hadoop/hbase/zookeeper/TestZNodePaths.java     |    4 +-
 hbase-common/pom.xml                               |  233 +-
 .../org/apache/hadoop/hbase/ArrayBackedTag.java    |   30 +-
 .../java/org/apache/hadoop/hbase/AuthUtil.java     |   92 +-
 .../org/apache/hadoop/hbase/BaseConfigurable.java  |    9 +-
 .../hadoop/hbase/ByteBufferExtendedCell.java       |   67 +-
 .../hadoop/hbase/ByteBufferKeyOnlyKeyValue.java    |   24 +-
 .../apache/hadoop/hbase/ByteBufferKeyValue.java    |   24 +-
 .../org/apache/hadoop/hbase/ByteBufferTag.java     |   12 +-
 .../main/java/org/apache/hadoop/hbase/Cell.java    |   60 +-
 .../java/org/apache/hadoop/hbase/CellBuilder.java  |    8 +-
 .../apache/hadoop/hbase/CellBuilderFactory.java    |   14 +-
 .../org/apache/hadoop/hbase/CellBuilderType.java   |    9 +-
 .../org/apache/hadoop/hbase/CellComparator.java    |   52 +-
 .../apache/hadoop/hbase/CellComparatorImpl.java    |  185 +-
 .../org/apache/hadoop/hbase/CellScannable.java     |   11 +-
 .../java/org/apache/hadoop/hbase/CellScanner.java  |   10 +-
 .../java/org/apache/hadoop/hbase/CellUtil.java     |  503 ++--
 .../java/org/apache/hadoop/hbase/ChoreService.java |   45 +-
 .../apache/hadoop/hbase/CompoundConfiguration.java |  125 +-
 .../java/org/apache/hadoop/hbase/ExtendedCell.java |   22 +-
 .../apache/hadoop/hbase/ExtendedCellBuilder.java   |   15 +-
 .../hadoop/hbase/ExtendedCellBuilderFactory.java   |    4 +-
 .../hadoop/hbase/ExtendedCellBuilderImpl.java      |    1 -
 .../apache/hadoop/hbase/HBaseConfiguration.java    |  161 +-
 .../org/apache/hadoop/hbase/HBaseIOException.java  |    7 +-
 .../hadoop/hbase/HBaseInterfaceAudience.java       |    9 +-
 .../java/org/apache/hadoop/hbase/HConstants.java   |  595 ++---
 .../hadoop/hbase/IndividualBytesFieldCell.java     |  112 +-
 .../hbase/IndividualBytesFieldCellBuilder.java     |    9 +-
 .../JitterScheduledThreadPoolExecutorImpl.java     |   34 +-
 .../java/org/apache/hadoop/hbase/KeyValue.java     | 1187 ++++-----
 .../org/apache/hadoop/hbase/KeyValueBuilder.java   |   10 +-
 .../org/apache/hadoop/hbase/KeyValueTestUtil.java  |   73 +-
 .../java/org/apache/hadoop/hbase/KeyValueUtil.java |  387 ++-
 .../apache/hadoop/hbase/MetaCellComparator.java    |   20 +-
 .../hadoop/hbase/MetaMutationAnnotation.java       |   11 +-
 .../apache/hadoop/hbase/NamespaceDescriptor.java   |   50 +-
 .../hadoop/hbase/NoTagsByteBufferKeyValue.java     |    3 +-
 .../org/apache/hadoop/hbase/NoTagsKeyValue.java    |    5 +-
 .../org/apache/hadoop/hbase/PrivateCellUtil.java   |  641 ++---
 .../main/java/org/apache/hadoop/hbase/RawCell.java |    3 +-
 .../org/apache/hadoop/hbase/RawCellBuilder.java    |   11 +-
 .../apache/hadoop/hbase/RawCellBuilderFactory.java |    8 +-
 .../org/apache/hadoop/hbase/ScheduledChore.java    |   56 +-
 .../java/org/apache/hadoop/hbase/ServerName.java   |  145 +-
 .../hadoop/hbase/ServiceNotRunningException.java   |   18 +
 .../hadoop/hbase/SizeCachedByteBufferKeyValue.java |   11 +-
 .../apache/hadoop/hbase/SizeCachedKeyValue.java    |   18 +-
 .../hbase/SizeCachedNoTagsByteBufferKeyValue.java  |   13 +-
 .../hadoop/hbase/SizeCachedNoTagsKeyValue.java     |   13 +-
 .../java/org/apache/hadoop/hbase/Stoppable.java    |    6 +-
 .../java/org/apache/hadoop/hbase/TableName.java    |  261 +-
 .../src/main/java/org/apache/hadoop/hbase/Tag.java |   26 +-
 .../java/org/apache/hadoop/hbase/TagBuilder.java   |    9 +-
 .../org/apache/hadoop/hbase/TagBuilderFactory.java |    7 +-
 .../main/java/org/apache/hadoop/hbase/TagType.java |    6 +-
 .../main/java/org/apache/hadoop/hbase/TagUtil.java |   19 +-
 .../org/apache/hadoop/hbase/backup/BackupType.java |    7 +-
 .../org/apache/hadoop/hbase/codec/BaseDecoder.java |   16 +-
 .../org/apache/hadoop/hbase/codec/BaseEncoder.java |    6 +-
 .../org/apache/hadoop/hbase/codec/CellCodec.java   |   49 +-
 .../hadoop/hbase/codec/CellCodecWithTags.java      |   34 +-
 .../java/org/apache/hadoop/hbase/codec/Codec.java  |   29 +-
 .../apache/hadoop/hbase/codec/CodecException.java  |    3 +-
 .../apache/hadoop/hbase/codec/KeyValueCodec.java   |   17 +-
 .../hadoop/hbase/codec/KeyValueCodecWithTags.java  |   18 +-
 .../hadoop/hbase/conf/ConfigurationManager.java    |   72 +-
 .../hadoop/hbase/conf/ConfigurationObserver.java   |    9 +-
 .../conf/PropagatingConfigurationObserver.java     |    9 +-
 .../hbase/exceptions/DeserializationException.java |    2 +-
 .../hadoop/hbase/exceptions/HBaseException.java    |    2 +-
 .../exceptions/IllegalArgumentIOException.java     |    4 +-
 .../hbase/exceptions/TimeoutIOException.java       |    4 +-
 .../hbase/exceptions/UnexpectedStateException.java |    2 +-
 .../hadoop/hbase/filter/ByteArrayComparable.java   |   42 +-
 .../hbase/io/BoundedDelegatingInputStream.java     |   19 +-
 .../hadoop/hbase/io/ByteArrayOutputStream.java     |    5 +-
 .../apache/hadoop/hbase/io/ByteBuffAllocator.java  |   36 +-
 .../hadoop/hbase/io/ByteBuffInputStream.java       |   13 +-
 .../hadoop/hbase/io/ByteBufferInputStream.java     |    9 +-
 .../hbase/io/ByteBufferListOutputStream.java       |    8 +-
 .../hadoop/hbase/io/ByteBufferOutputStream.java    |   45 +-
 .../apache/hadoop/hbase/io/ByteBufferWriter.java   |    6 +-
 .../hbase/io/ByteBufferWriterDataOutputStream.java |    6 +-
 .../hbase/io/ByteBufferWriterOutputStream.java     |   35 +-
 .../apache/hadoop/hbase/io/CellOutputStream.java   |   27 +-
 .../io/DeallocateRewriteByteBuffAllocator.java     |   10 +-
 .../hadoop/hbase/io/DelegatingInputStream.java     |   22 +-
 .../java/org/apache/hadoop/hbase/io/HeapSize.java  |   21 +-
 .../hadoop/hbase/io/ImmutableBytesWritable.java    |  102 +-
 .../apache/hadoop/hbase/io/SizedCellScanner.java   |   11 +-
 .../hadoop/hbase/io/TagCompressionContext.java     |   50 +-
 .../java/org/apache/hadoop/hbase/io/TimeRange.java |   42 +-
 .../apache/hadoop/hbase/io/compress/CanReinit.java |   27 +-
 .../hadoop/hbase/io/compress/Compression.java      |  172 +-
 .../hadoop/hbase/io/compress/CompressionUtil.java  |   40 +-
 .../hadoop/hbase/io/compress/DictionaryCache.java  |   68 +-
 .../hbase/io/compress/ReusableStreamGzipCodec.java |   55 +-
 .../org/apache/hadoop/hbase/io/crypto/Cipher.java  |   54 +-
 .../hadoop/hbase/io/crypto/CipherProvider.java     |   26 +-
 .../org/apache/hadoop/hbase/io/crypto/Context.java |   32 +-
 .../hbase/io/crypto/CryptoCipherProvider.java      |   30 +-
 .../apache/hadoop/hbase/io/crypto/Decryptor.java   |   12 +-
 .../hbase/io/crypto/DefaultCipherProvider.java     |   30 +-
 .../apache/hadoop/hbase/io/crypto/Encryption.java  |  313 +--
 .../apache/hadoop/hbase/io/crypto/Encryptor.java   |   12 +-
 .../apache/hadoop/hbase/io/crypto/KeyProvider.java |   42 +-
 .../hbase/io/crypto/KeyStoreKeyProvider.java       |   68 +-
 .../org/apache/hadoop/hbase/io/crypto/aes/AES.java |   10 +-
 .../hadoop/hbase/io/crypto/aes/AESDecryptor.java   |    3 +-
 .../hadoop/hbase/io/crypto/aes/AESEncryptor.java   |    3 +-
 .../hbase/io/crypto/aes/CommonsCryptoAES.java      |   20 +-
 .../io/crypto/aes/CommonsCryptoAESDecryptor.java   |    6 +-
 .../io/crypto/aes/CommonsCryptoAESEncryptor.java   |    6 +-
 .../hadoop/hbase/io/crypto/aes/CryptoAES.java      |   46 +-
 .../io/encoding/AbstractDataBlockEncoder.java      |   35 +-
 .../io/encoding/BufferedDataBlockEncoder.java      |  256 +-
 .../hadoop/hbase/io/encoding/CompressionState.java |   65 +-
 .../hbase/io/encoding/CopyKeyDataBlockEncoder.java |   49 +-
 .../hadoop/hbase/io/encoding/DataBlockEncoder.java |  103 +-
 .../hbase/io/encoding/DataBlockEncoding.java       |   69 +-
 .../hbase/io/encoding/DiffKeyDeltaEncoder.java     |  143 +-
 .../hadoop/hbase/io/encoding/EncodedDataBlock.java |  104 +-
 .../encoding/EncoderBufferTooSmallException.java   |   23 +-
 .../hadoop/hbase/io/encoding/EncodingState.java    |    2 +-
 .../hbase/io/encoding/FastDiffDeltaEncoder.java    |  231 +-
 .../io/encoding/HFileBlockDecodingContext.java     |   55 +-
 .../encoding/HFileBlockDefaultDecodingContext.java |   39 +-
 .../encoding/HFileBlockDefaultEncodingContext.java |   65 +-
 .../io/encoding/HFileBlockEncodingContext.java     |   44 +-
 .../hadoop/hbase/io/encoding/NoneEncoder.java      |    5 +-
 .../hbase/io/encoding/PrefixKeyDeltaEncoder.java   |   74 +-
 .../hadoop/hbase/io/encoding/RowIndexCodecV1.java  |   70 +-
 .../hbase/io/encoding/RowIndexEncoderV1.java       |   32 +-
 .../hadoop/hbase/io/encoding/RowIndexSeekerV1.java |   72 +-
 .../io/hadoopbackport/ThrottledInputStream.java    |   45 +-
 .../apache/hadoop/hbase/io/hfile/BlockType.java    |   56 +-
 .../apache/hadoop/hbase/io/hfile/HFileContext.java |   73 +-
 .../hadoop/hbase/io/hfile/HFileContextBuilder.java |   15 +-
 .../apache/hadoop/hbase/io/util/BlockIOUtils.java  |   76 +-
 .../apache/hadoop/hbase/io/util/Dictionary.java    |   50 +-
 .../apache/hadoop/hbase/io/util/LRUDictionary.java |   41 +-
 .../apache/hadoop/hbase/io/util/StreamUtils.java   |   16 +-
 .../org/apache/hadoop/hbase/log/HBaseMarkers.java  |    3 +-
 .../java/org/apache/hadoop/hbase/net/Address.java  |   27 +-
 .../java/org/apache/hadoop/hbase/nio/ByteBuff.java |  241 +-
 .../hadoop/hbase/nio/HBaseReferenceCounted.java    |    2 +-
 .../org/apache/hadoop/hbase/nio/MultiByteBuff.java |  193 +-
 .../java/org/apache/hadoop/hbase/nio/RefCnt.java   |    2 +-
 .../apache/hadoop/hbase/nio/SingleByteBuff.java    |    4 +-
 .../apache/hadoop/hbase/rsgroup/RSGroupInfo.java   |   13 +-
 .../hadoop/hbase/security/SecurityConstants.java   |   15 +-
 .../apache/hadoop/hbase/security/Superusers.java   |   30 +-
 .../org/apache/hadoop/hbase/security/User.java     |  155 +-
 .../apache/hadoop/hbase/security/UserProvider.java |  110 +-
 .../hbase/trace/HBaseSemanticAttributes.java       |   18 +-
 .../org/apache/hadoop/hbase/trace/TraceUtil.java   |   33 +-
 .../hadoop/hbase/types/CopyOnWriteArrayMap.java    |   88 +-
 .../org/apache/hadoop/hbase/types/DataType.java    |   68 +-
 .../hadoop/hbase/types/FixedLengthWrapper.java     |   27 +-
 .../org/apache/hadoop/hbase/types/OrderedBlob.java |    8 +-
 .../apache/hadoop/hbase/types/OrderedBlobVar.java  |    6 +-
 .../hadoop/hbase/types/OrderedBytesBase.java       |    5 +-
 .../apache/hadoop/hbase/types/OrderedFloat32.java  |    2 +-
 .../apache/hadoop/hbase/types/OrderedFloat64.java  |    2 +-
 .../apache/hadoop/hbase/types/OrderedInt16.java    |    2 +-
 .../apache/hadoop/hbase/types/OrderedInt32.java    |    2 +-
 .../apache/hadoop/hbase/types/OrderedInt64.java    |    2 +-
 .../org/apache/hadoop/hbase/types/OrderedInt8.java |    2 +-
 .../apache/hadoop/hbase/types/OrderedNumeric.java  |   14 +-
 .../apache/hadoop/hbase/types/OrderedString.java   |    2 +-
 .../java/org/apache/hadoop/hbase/types/PBType.java |   21 +-
 .../org/apache/hadoop/hbase/types/RawByte.java     |    6 +-
 .../org/apache/hadoop/hbase/types/RawBytes.java    |    9 +-
 .../hadoop/hbase/types/RawBytesFixedLength.java    |   14 +-
 .../hadoop/hbase/types/RawBytesTerminated.java     |   17 +-
 .../org/apache/hadoop/hbase/types/RawDouble.java   |    6 +-
 .../org/apache/hadoop/hbase/types/RawFloat.java    |    6 +-
 .../org/apache/hadoop/hbase/types/RawInteger.java  |    6 +-
 .../org/apache/hadoop/hbase/types/RawLong.java     |    6 +-
 .../org/apache/hadoop/hbase/types/RawShort.java    |    6 +-
 .../org/apache/hadoop/hbase/types/RawString.java   |    9 +-
 .../hadoop/hbase/types/RawStringFixedLength.java   |   10 +-
 .../hadoop/hbase/types/RawStringTerminated.java    |   15 +-
 .../java/org/apache/hadoop/hbase/types/Struct.java |   54 +-
 .../apache/hadoop/hbase/types/StructBuilder.java   |    6 +-
 .../apache/hadoop/hbase/types/StructIterator.java  |   38 +-
 .../hadoop/hbase/types/TerminatedWrapper.java      |   20 +-
 .../java/org/apache/hadoop/hbase/types/Union2.java |   10 +-
 .../java/org/apache/hadoop/hbase/types/Union3.java |   10 +-
 .../java/org/apache/hadoop/hbase/types/Union4.java |   10 +-
 .../hadoop/hbase/util/AbstractByteRange.java       |   48 +-
 .../hadoop/hbase/util/AbstractHBaseTool.java       |   58 +-
 .../hbase/util/AbstractPositionedByteRange.java    |   40 +-
 .../org/apache/hadoop/hbase/util/Addressing.java   |   40 +-
 .../org/apache/hadoop/hbase/util/AtomicUtils.java  |    3 +-
 .../java/org/apache/hadoop/hbase/util/AvlUtil.java |  168 +-
 .../hbase/util/BoundedCompletionService.java       |   19 +-
 .../apache/hadoop/hbase/util/ByteArrayHashKey.java |    2 +-
 .../hadoop/hbase/util/ByteBufferAllocator.java     |    3 +-
 .../apache/hadoop/hbase/util/ByteBufferArray.java  |   46 +-
 .../apache/hadoop/hbase/util/ByteBufferUtils.java  |  329 ++-
 .../org/apache/hadoop/hbase/util/ByteRange.java    |  158 +-
 .../apache/hadoop/hbase/util/ByteRangeUtils.java   |    3 +-
 .../java/org/apache/hadoop/hbase/util/Bytes.java   | 1069 ++++----
 .../org/apache/hadoop/hbase/util/CellHashKey.java  |    2 +-
 .../org/apache/hadoop/hbase/util/ChecksumType.java |   35 +-
 .../apache/hadoop/hbase/util/ClassLoaderBase.java  |   10 +-
 .../org/apache/hadoop/hbase/util/ClassSize.java    |  173 +-
 .../java/org/apache/hadoop/hbase/util/Classes.java |   19 +-
 .../apache/hadoop/hbase/util/CollectionUtils.java  |    5 +-
 .../apache/hadoop/hbase/util/CommonFSUtils.java    |  274 +-
 .../hadoop/hbase/util/ConcatenatedLists.java       |   21 +-
 .../hadoop/hbase/util/ConcurrentMapUtils.java      |    8 +-
 .../hadoop/hbase/util/CoprocessorClassLoader.java  |  156 +-
 .../java/org/apache/hadoop/hbase/util/Counter.java |   48 +-
 .../java/org/apache/hadoop/hbase/util/DNS.java     |   49 +-
 .../hadoop/hbase/util/DefaultEnvironmentEdge.java  |    1 -
 .../hadoop/hbase/util/DynamicClassLoader.java      |   74 +-
 .../apache/hadoop/hbase/util/EnvironmentEdge.java  |    7 +-
 .../hadoop/hbase/util/EnvironmentEdgeManager.java  |   86 +-
 .../apache/hadoop/hbase/util/ExceptionUtil.java    |   15 +-
 .../hbase/util/ExponentialMovingAverage.java       |    1 -
 .../org/apache/hadoop/hbase/util/FutureUtils.java  |   10 +-
 .../org/apache/hadoop/hbase/util/GsonUtil.java     |    2 +-
 .../java/org/apache/hadoop/hbase/util/Hash.java    |   17 +-
 .../java/org/apache/hadoop/hbase/util/HashKey.java |    6 +-
 .../java/org/apache/hadoop/hbase/util/IdLock.java  |   39 +-
 .../hadoop/hbase/util/ImmutableByteArray.java      |    2 +-
 .../hbase/util/IncrementingEnvironmentEdge.java    |    5 +-
 .../org/apache/hadoop/hbase/util/JRubyFormat.java  |   29 +-
 .../java/org/apache/hadoop/hbase/util/JVM.java     |   88 +-
 .../org/apache/hadoop/hbase/util/JenkinsHash.java  |  291 +-
 .../org/apache/hadoop/hbase/util/KeyLocker.java    |   43 +-
 .../java/org/apache/hadoop/hbase/util/MD5Hash.java |   27 +-
 .../java/org/apache/hadoop/hbase/util/Methods.java |   26 +-
 .../apache/hadoop/hbase/util/MovingAverage.java    |    4 +-
 .../org/apache/hadoop/hbase/util/MurmurHash.java   |   15 +-
 .../org/apache/hadoop/hbase/util/MurmurHash3.java  |   48 +-
 .../org/apache/hadoop/hbase/util/NonceKey.java     |   13 +-
 .../apache/hadoop/hbase/util/ObjectIntPair.java    |    8 +-
 .../org/apache/hadoop/hbase/util/ObjectPool.java   |   62 +-
 .../java/org/apache/hadoop/hbase/util/Order.java   |   13 +-
 .../org/apache/hadoop/hbase/util/OrderedBytes.java |  849 +++---
 .../java/org/apache/hadoop/hbase/util/Pair.java    |   67 +-
 .../apache/hadoop/hbase/util/PairOfSameType.java   |   27 +-
 .../hadoop/hbase/util/PositionedByteRange.java     |   46 +-
 .../apache/hadoop/hbase/util/PrettyPrinter.java    |  109 +-
 .../org/apache/hadoop/hbase/util/Random64.java     |   44 +-
 .../apache/hadoop/hbase/util/ReflectionUtils.java  |   82 +-
 .../apache/hadoop/hbase/util/ReservoirSample.java  |    2 +-
 .../org/apache/hadoop/hbase/util/RetryCounter.java |   28 +-
 .../hadoop/hbase/util/RetryCounterFactory.java     |   10 +-
 .../apache/hadoop/hbase/util/RowBloomHashKey.java  |    2 +-
 .../hadoop/hbase/util/RowColBloomHashKey.java      |    4 +-
 .../apache/hadoop/hbase/util/SimpleByteRange.java  |   12 +-
 .../hadoop/hbase/util/SimpleMovingAverage.java     |    1 -
 .../hadoop/hbase/util/SimpleMutableByteRange.java  |   70 +-
 .../hbase/util/SimplePositionedByteRange.java      |   34 +-
 .../util/SimplePositionedMutableByteRange.java     |  111 +-
 .../java/org/apache/hadoop/hbase/util/Sleeper.java |   35 +-
 .../apache/hadoop/hbase/util/SoftObjectPool.java   |   16 +-
 .../java/org/apache/hadoop/hbase/util/Strings.java |   44 +-
 .../java/org/apache/hadoop/hbase/util/Threads.java |   62 +-
 .../apache/hadoop/hbase/util/TimeMeasurable.java   |    8 +-
 .../java/org/apache/hadoop/hbase/util/Triple.java  |    4 +-
 .../org/apache/hadoop/hbase/util/UnsafeAccess.java |   67 +-
 .../org/apache/hadoop/hbase/util/VersionInfo.java  |   27 +-
 .../apache/hadoop/hbase/util/WeakObjectPool.java   |   21 +-
 .../hadoop/hbase/util/WeightedMovingAverage.java   |    6 +-
 .../hadoop/hbase/util/WindowMovingAverage.java     |   14 +-
 .../apache/hadoop/hbase/zookeeper/ZKConfig.java    |  119 +-
 hbase-common/src/main/resources/hbase-default.xml  |    4 +-
 hbase-common/src/saveVersion.sh                    |    1 -
 .../java/org/apache/hadoop/hbase/ClassFinder.java  |   63 +-
 .../org/apache/hadoop/hbase/ClassTestFinder.java   |   23 +-
 .../apache/hadoop/hbase/HBaseClassTestRule.java    |   28 +-
 .../hadoop/hbase/HBaseClassTestRuleChecker.java    |   16 +-
 .../hadoop/hbase/HBaseCommonTestingUtility.java    |   53 +-
 .../org/apache/hadoop/hbase/MatcherPredicate.java  |   13 +-
 .../org/apache/hadoop/hbase/ResourceChecker.java   |   35 +-
 .../hadoop/hbase/ResourceCheckerJUnitListener.java |   16 +-
 .../org/apache/hadoop/hbase/SystemExitRule.java    |    7 +-
 .../org/apache/hadoop/hbase/TableNameTestRule.java |    4 +-
 .../hadoop/hbase/TestByteBufferKeyValue.java       |  155 +-
 .../org/apache/hadoop/hbase/TestCellBuilder.java   |   84 +-
 .../apache/hadoop/hbase/TestCellComparator.java    |  127 +-
 .../java/org/apache/hadoop/hbase/TestCellUtil.java |  103 +-
 .../org/apache/hadoop/hbase/TestChoreService.java  |    4 +-
 .../org/apache/hadoop/hbase/TestClassFinder.java   |   74 +-
 .../hadoop/hbase/TestCompoundConfiguration.java    |   36 +-
 .../hadoop/hbase/TestHBaseClassTestRule.java       |   28 +-
 .../hadoop/hbase/TestHBaseConfiguration.java       |  150 +-
 .../hadoop/hbase/TestIndividualBytesFieldCell.java |  171 +-
 .../java/org/apache/hadoop/hbase/TestKeyValue.java |  239 +-
 .../org/apache/hadoop/hbase/TestServerName.java    |   16 +-
 .../apache/hadoop/hbase/TestSystemExitInTest.java  |    7 +-
 .../org/apache/hadoop/hbase/TestTableName.java     |   57 +-
 .../org/apache/hadoop/hbase/TestTagBuilder.java    |   15 +-
 .../java/org/apache/hadoop/hbase/TestTagUtil.java  |    4 +-
 .../java/org/apache/hadoop/hbase/TestTimeout.java  |   16 +-
 .../apache/hadoop/hbase/TimedOutTestsListener.java |   38 +-
 .../test/java/org/apache/hadoop/hbase/Waiter.java  |   44 +-
 .../apache/hadoop/hbase/codec/TestCellCodec.java   |   15 +-
 .../hadoop/hbase/codec/TestCellCodecWithTags.java  |   27 +-
 .../hadoop/hbase/codec/TestKeyValueCodec.java      |   23 +-
 .../hbase/codec/TestKeyValueCodecWithTags.java     |   27 +-
 .../hbase/conf/TestConfigurationManager.java       |    9 +-
 .../hadoop/hbase/io/TestByteBuffAllocator.java     |    6 +-
 .../hbase/io/TestByteBufferListOutputStream.java   |    4 +-
 .../hbase/io/TestMultiByteBuffInputStream.java     |    4 +-
 .../hadoop/hbase/io/TestTagCompressionContext.java |   46 +-
 .../hbase/io/compress/CompressionTestBase.java     |   86 +-
 .../hbase/io/crypto/KeyProviderForTesting.java     |   26 +-
 .../hadoop/hbase/io/crypto/TestCipherProvider.java |   18 +-
 .../hadoop/hbase/io/crypto/TestEncryption.java     |   40 +-
 .../hadoop/hbase/io/crypto/TestKeyProvider.java    |    6 +-
 .../hbase/io/crypto/TestKeyStoreKeyProvider.java   |   13 +-
 .../apache/hadoop/hbase/io/crypto/aes/TestAES.java |    8 +-
 .../hadoop/hbase/io/crypto/aes/TestCommonsAES.java |    7 +-
 .../hadoopbackport/TestThrottledInputStream.java   |    6 +-
 .../hadoop/hbase/io/util/TestLRUDictionary.java    |   45 +-
 .../apache/hadoop/hbase/logging/TestJul2Slf4j.java |    4 +-
 .../hadoop/hbase/logging/TestLog4jUtils.java       |    2 +-
 .../apache/hadoop/hbase/net/BoundSocketMaker.java  |   13 +-
 .../org/apache/hadoop/hbase/net/TestAddress.java   |   14 +-
 .../apache/hadoop/hbase/nio/TestMultiByteBuff.java |   23 +-
 .../hadoop/hbase/nio/TestSingleByteBuff.java       |    4 +-
 .../hadoop/hbase/types/TestCopyOnWriteMaps.java    |   42 +-
 .../hadoop/hbase/types/TestFixedLengthWrapper.java |   18 +-
 .../apache/hadoop/hbase/types/TestOrderedBlob.java |   21 +-
 .../hadoop/hbase/types/TestOrderedBlobVar.java     |   22 +-
 .../hadoop/hbase/types/TestOrderedString.java      |   19 +-
 .../apache/hadoop/hbase/types/TestRawString.java   |   14 +-
 .../org/apache/hadoop/hbase/types/TestStruct.java  |  126 +-
 .../hbase/types/TestStructNullExtension.java       |   27 +-
 .../hadoop/hbase/types/TestTerminatedWrapper.java  |   21 +-
 .../org/apache/hadoop/hbase/types/TestUnion2.java  |   19 +-
 .../hadoop/hbase/util/AbstractHBaseToolTest.java   |   36 +-
 .../hadoop/hbase/util/ClassLoaderTestHelper.java   |   79 +-
 .../util/EnvironmentEdgeManagerTestHelper.java     |    7 +-
 .../hadoop/hbase/util/LoadTestKVGenerator.java     |   74 +-
 .../hbase/util/NonRepeatedEnvironmentEdge.java     |    2 +-
 .../hadoop/hbase/util/RandomDistribution.java      |  105 +-
 .../hadoop/hbase/util/RedundantKVGenerator.java    |  145 +-
 .../hadoop/hbase/util/SimpleKdcServerUtil.java     |   25 +-
 .../org/apache/hadoop/hbase/util/TestAvlUtil.java  |   14 +-
 .../hadoop/hbase/util/TestByteBufferArray.java     |    6 +-
 .../hadoop/hbase/util/TestByteBufferUtils.java     |  123 +-
 .../hadoop/hbase/util/TestByteRangeUtils.java      |   46 +-
 .../util/TestByteRangeWithKVSerialization.java     |   19 +-
 .../org/apache/hadoop/hbase/util/TestBytes.java    |  134 +-
 .../org/apache/hadoop/hbase/util/TestClasses.java  |    8 +-
 .../hadoop/hbase/util/TestCommonFSUtils.java       |   13 +-
 .../hadoop/hbase/util/TestConcatenatedLists.java   |   10 +-
 .../hbase/util/TestCoprocessorClassLoader.java     |   36 +-
 .../org/apache/hadoop/hbase/util/TestCounter.java  |   26 +-
 .../hadoop/hbase/util/TestDynamicClassLoader.java  |   18 +-
 .../hbase/util/TestEnvironmentEdgeManager.java     |    9 +-
 .../apache/hadoop/hbase/util/TestFutureUtils.java  |    2 +-
 .../org/apache/hadoop/hbase/util/TestGsonUtil.java |    5 +-
 .../apache/hadoop/hbase/util/TestJRubyFormat.java  |    7 +-
 .../apache/hadoop/hbase/util/TestKeyLocker.java    |    8 +-
 .../hadoop/hbase/util/TestLoadTestKVGenerator.java |    8 +-
 .../hadoop/hbase/util/TestMovingAverage.java       |    7 +-
 .../org/apache/hadoop/hbase/util/TestOrder.java    |    7 +-
 .../apache/hadoop/hbase/util/TestOrderedBytes.java |  327 +--
 .../hadoop/hbase/util/TestReservoirSample.java     |    2 +-
 .../apache/hadoop/hbase/util/TestRetryCounter.java |   14 +-
 .../hadoop/hbase/util/TestShowProperties.java      |   10 +-
 .../hadoop/hbase/util/TestSimpleKdcServerUtil.java |    9 +-
 .../hbase/util/TestSimpleMutableByteRange.java     |   30 +-
 .../util/TestSimplePositionedMutableByteRange.java |    6 +-
 .../org/apache/hadoop/hbase/util/TestThreads.java  |   17 +-
 .../apache/hadoop/hbase/util/TestVersionInfo.java  |    4 +-
 .../hadoop/hbase/util/TestWeakObjectPool.java      |   23 +-
 .../hbase/util/TimeOffsetEnvironmentEdge.java      |    7 +-
 .../hadoop/hbase/zookeeper/TestZKConfig.java       |   27 +-
 .../hbase-compression-aircompressor/pom.xml        |   72 +-
 .../compress/aircompressor/HadoopCompressor.java   |   31 +-
 .../compress/aircompressor/HadoopDecompressor.java |   31 +-
 .../hbase/io/compress/aircompressor/Lz4Codec.java  |   33 +-
 .../hbase/io/compress/aircompressor/LzoCodec.java  |   33 +-
 .../io/compress/aircompressor/SnappyCodec.java     |   33 +-
 .../hbase/io/compress/aircompressor/ZstdCodec.java |   48 +-
 .../aircompressor/TestHFileCompressionLz4.java     |    6 +-
 .../aircompressor/TestHFileCompressionLzo.java     |    6 +-
 .../aircompressor/TestHFileCompressionSnappy.java  |    6 +-
 .../aircompressor/TestHFileCompressionZstd.java    |    6 +-
 .../io/compress/aircompressor/TestLz4Codec.java    |   27 +-
 .../io/compress/aircompressor/TestLzoCodec.java    |   27 +-
 .../io/compress/aircompressor/TestSnappyCodec.java |   27 +-
 .../aircompressor/TestWALCompressionLz4.java       |    4 +-
 .../aircompressor/TestWALCompressionLzo.java       |    4 +-
 .../aircompressor/TestWALCompressionSnappy.java    |    4 +-
 .../aircompressor/TestWALCompressionZstd.java      |    4 +-
 .../io/compress/aircompressor/TestZstdCodec.java   |   27 +-
 hbase-compression/hbase-compression-brotli/pom.xml |   72 +-
 .../hbase/io/compress/brotli/BrotliCodec.java      |   27 +-
 .../hbase/io/compress/brotli/BrotliCompressor.java |   24 +-
 .../io/compress/brotli/BrotliDecompressor.java     |   24 +-
 .../hbase/io/compress/brotli/TestBrotliCodec.java  |   27 +-
 .../brotli/TestHFileCompressionBrotli.java         |    6 +-
 .../compress/brotli/TestWALCompressionBrotli.java  |    4 +-
 hbase-compression/hbase-compression-lz4/pom.xml    |   50 +-
 .../hadoop/hbase/io/compress/lz4/Lz4Codec.java     |   28 +-
 .../hbase/io/compress/lz4/Lz4Compressor.java       |   29 +-
 .../hbase/io/compress/lz4/Lz4Decompressor.java     |   29 +-
 .../io/compress/lz4/TestHFileCompressionLz4.java   |    6 +-
 .../hadoop/hbase/io/compress/lz4/TestLz4Codec.java |   29 +-
 .../io/compress/lz4/TestWALCompressionLz4.java     |    4 +-
 hbase-compression/hbase-compression-snappy/pom.xml |   50 +-
 .../hbase/io/compress/xerial/SnappyCodec.java      |   28 +-
 .../hbase/io/compress/xerial/SnappyCompressor.java |   25 +-
 .../io/compress/xerial/SnappyDecompressor.java     |   25 +-
 .../xerial/TestHFileCompressionSnappy.java         |    6 +-
 .../hbase/io/compress/xerial/TestSnappyCodec.java  |   27 +-
 .../compress/xerial/TestWALCompressionSnappy.java  |    4 +-
 hbase-compression/hbase-compression-xz/pom.xml     |   50 +-
 .../hadoop/hbase/io/compress/xz/LzmaCodec.java     |   28 +-
 .../hbase/io/compress/xz/LzmaCompressor.java       |   28 +-
 .../hbase/io/compress/xz/LzmaDecompressor.java     |   24 +-
 .../io/compress/xz/TestHFileCompressionLzma.java   |    6 +-
 .../hadoop/hbase/io/compress/xz/TestLzmaCodec.java |   29 +-
 .../io/compress/xz/TestWALCompressionLzma.java     |    4 +-
 hbase-compression/hbase-compression-zstd/pom.xml   |   50 +-
 .../hadoop/hbase/io/compress/zstd/ZstdCodec.java   |   38 +-
 .../hbase/io/compress/zstd/ZstdCompressor.java     |   29 +-
 .../hbase/io/compress/zstd/ZstdDecompressor.java   |   27 +-
 .../io/compress/zstd/TestHFileCompressionZstd.java |    6 +-
 .../io/compress/zstd/TestWALCompressionZstd.java   |    4 +-
 .../hbase/io/compress/zstd/TestZstdCodec.java      |   29 +-
 .../hbase/io/compress/zstd/TestZstdDictionary.java |   27 +-
 .../zstd/TestZstdDictionarySplitMerge.java         |   16 +-
 hbase-compression/pom.xml                          |    8 +-
 hbase-endpoint/pom.xml                             |   94 +-
 .../client/coprocessor/AggregationClient.java      |  677 +++--
 .../client/coprocessor/AggregationHelper.java      |   25 +-
 .../client/coprocessor/AsyncAggregationClient.java |  112 +-
 .../hbase/coprocessor/AggregateImplementation.java |  176 +-
 .../apache/hadoop/hbase/coprocessor/Export.java    |  174 +-
 .../security/access/SecureBulkLoadEndpoint.java    |   68 +-
 .../hbase/client/TestAsyncAggregationClient.java   |   41 +-
 .../hbase/client/TestRpcControllerFactory.java     |    8 +-
 .../coprocessor/ColumnAggregationEndpoint.java     |   10 +-
 .../ColumnAggregationEndpointNullResponse.java     |   23 +-
 .../ColumnAggregationEndpointWithErrors.java       |   18 +-
 .../coprocessor/ProtobufCoprocessorService.java    |   21 +-
 .../coprocessor/TestAsyncCoprocessorEndpoint.java  |   59 +-
 .../coprocessor/TestBatchCoprocessorEndpoint.java  |  116 +-
 .../hadoop/hbase/coprocessor/TestClassLoading.java |  195 +-
 .../hbase/coprocessor/TestCoprocessorEndpoint.java |  111 +-
 .../TestCoprocessorEndpointTracing.java            |  253 +-
 ...estCoprocessorServiceBackwardCompatibility.java |   36 +-
 .../coprocessor/TestCoprocessorTableEndpoint.java  |   25 +-
 .../hadoop/hbase/coprocessor/TestImportExport.java |    6 +-
 .../TestRegionServerCoprocessorEndpoint.java       |   41 +-
 .../coprocessor/TestRowProcessorEndpoint.java      |  134 +-
 .../hadoop/hbase/coprocessor/TestSecureExport.java |  175 +-
 .../hadoop/hbase/ipc/TestCoprocessorRpcUtils.java  |    8 +-
 .../regionserver/SecureBulkLoadEndpointClient.java |   62 +-
 ...HRegionServerBulkLoadWithOldSecureEndpoint.java |   48 +-
 .../regionserver/TestServerCustomProtocol.java     |  208 +-
 ...estReplicationSyncUpToolWithBulkLoadedData.java |   16 +-
 hbase-examples/README.txt                          |    2 +-
 hbase-examples/pom.xml                             |  112 +-
 .../hbase/client/example/AsyncClientExample.java   |   17 +-
 .../client/example/BufferedMutatorExample.java     |    8 +-
 .../client/example/ExportEndpointExample.java      |   16 +-
 .../hbase/client/example/HttpProxyExample.java     |   11 +-
 .../client/example/MultiThreadedClientExample.java |   79 +-
 .../hbase/client/example/RefreshHFilesClient.java  |   24 +-
 .../coprocessor/example/BulkDeleteEndpoint.java    |   27 +-
 .../example/DelegatingInternalScanner.java         |    2 +-
 .../example/ExampleMasterObserverWithMetrics.java  |   16 +-
 .../example/ExampleRegionObserverWithMetrics.java  |   38 +-
 .../coprocessor/example/RefreshHFilesEndpoint.java |   10 +-
 .../coprocessor/example/RowCountEndpoint.java      |   28 +-
 .../coprocessor/example/ScanModifyingObserver.java |   28 +-
 .../example/ValueRewritingObserver.java            |   34 +-
 .../example/WriteHeavyIncrementObserver.java       |   52 +-
 .../example/ZooKeeperScanPolicyObserver.java       |   39 +-
 .../hadoop/hbase/mapreduce/IndexBuilder.java       |   47 +-
 .../hadoop/hbase/mapreduce/SampleUploader.java     |   46 +-
 .../security/provider/example/SaslPlainServer.java |   32 +-
 .../provider/example/ShadeClientTokenUtil.java     |   12 +-
 .../provider/example/ShadeProviderSelector.java    |   20 +-
 .../example/ShadeSaslAuthenticationProvider.java   |   10 +-
 .../ShadeSaslClientAuthenticationProvider.java     |   17 +-
 .../ShadeSaslServerAuthenticationProvider.java     |   39 +-
 .../provider/example/ShadeTokenIdentifier.java     |    1 -
 .../org/apache/hadoop/hbase/thrift/DemoClient.java |  115 +-
 .../apache/hadoop/hbase/thrift/HttpDoAsClient.java |   54 +-
 .../apache/hadoop/hbase/thrift2/DemoClient.java    |   40 +-
 .../java/org/apache/hadoop/hbase/types/PBCell.java |    2 +-
 .../org/apache/hadoop/hbase/util/ClientUtils.java  |   19 +-
 .../src/main/python/thrift1/DemoClient.py          |    1 -
 .../src/main/python/thrift1/gen-py/hbase/Hbase.py  |    1 -
 .../python/thrift2/gen-py/hbase/THBaseService.py   |    1 -
 .../src/main/sh/healthcheck/healthcheck.sh         |   12 +-
 .../client/example/TestAsyncClientExample.java     |    4 +-
 .../hbase/client/example/TestHttpProxyExample.java |   10 +-
 .../client/example/TestRefreshHFilesClient.java    |    4 +-
 .../coprocessor/example/TestRefreshHFilesBase.java |    8 +-
 .../example/TestRefreshHFilesEndpoint.java         |   15 +-
 .../example/TestScanModifyingObserver.java         |   18 +-
 .../example/TestValueReplacingCompaction.java      |   18 +-
 .../example/TestWriteHeavyIncrementObserver.java   |   10 +-
 ...avyIncrementObserverWithMemStoreCompaction.java |   16 +-
 .../example/TestZooKeeperScanPolicyObserver.java   |   20 +-
 .../WriteHeavyIncrementObserverTestBase.java       |    5 +-
 .../hbase/mapreduce/TestMapReduceExamples.java     |   20 +-
 .../TestShadeSaslAuthenticationProvider.java       |   72 +-
 .../org/apache/hadoop/hbase/types/TestPBCell.java  |   11 +-
 hbase-external-blockcache/pom.xml                  |   79 +-
 .../hadoop/hbase/io/hfile/MemcachedBlockCache.java |   75 +-
 hbase-hadoop-compat/pom.xml                        |   65 +-
 .../apache/hadoop/hbase/CompatibilityFactory.java  |   14 +-
 .../hbase/CompatibilitySingletonFactory.java       |   19 +-
 .../apache/hadoop/hbase/io/MetricsIOSource.java    |   19 +-
 .../apache/hadoop/hbase/io/MetricsIOWrapper.java   |    3 +-
 .../hadoop/hbase/ipc/MetricsHBaseServerSource.java |   51 +-
 .../hbase/ipc/MetricsHBaseServerSourceFactory.java |   14 +-
 .../hbase/ipc/MetricsHBaseServerWrapper.java       |    4 +-
 .../master/MetricsAssignmentManagerSource.java     |   24 +-
 .../master/MetricsMasterFileSystemSource.java      |    4 +-
 .../hbase/master/MetricsMasterProcSource.java      |    3 +-
 .../master/MetricsMasterProcSourceFactory.java     |    3 +-
 .../hbase/master/MetricsMasterQuotaSource.java     |   46 +-
 .../master/MetricsMasterQuotaSourceFactory.java    |   15 +-
 .../hadoop/hbase/master/MetricsMasterSource.java   |    7 +-
 .../hbase/master/MetricsMasterSourceFactory.java   |    3 +-
 .../hadoop/hbase/master/MetricsMasterWrapper.java  |   20 +-
 .../hadoop/hbase/master/MetricsSnapshotSource.java |    3 +-
 .../master/balancer/MetricsBalancerSource.java     |    5 +-
 .../balancer/MetricsStochasticBalancerSource.java  |   12 +-
 .../apache/hadoop/hbase/metrics/BaseSource.java    |   30 +-
 .../hbase/metrics/ExceptionTrackingSource.java     |   40 +-
 .../hbase/metrics/JvmPauseMonitorSource.java       |    9 +-
 .../apache/hadoop/hbase/metrics/MBeanSource.java   |   12 +-
 .../hadoop/hbase/metrics/OperationMetrics.java     |    7 +-
 .../MetricsHeapMemoryManagerSource.java            |   37 +-
 .../regionserver/MetricsRegionAggregateSource.java |    9 +-
 .../MetricsRegionServerQuotaSource.java            |   32 +-
 .../regionserver/MetricsRegionServerSource.java    |  198 +-
 .../MetricsRegionServerSourceFactory.java          |   10 +-
 .../regionserver/MetricsRegionServerWrapper.java   |   26 +-
 .../hbase/regionserver/MetricsRegionSource.java    |   12 +-
 .../hbase/regionserver/MetricsRegionWrapper.java   |   44 +-
 .../regionserver/MetricsTableAggregateSource.java  |    8 +-
 .../hbase/regionserver/MetricsTableLatencies.java  |   48 +-
 .../hbase/regionserver/MetricsTableQueryMeter.java |   19 +-
 .../hbase/regionserver/MetricsTableSource.java     |   13 +-
 .../regionserver/MetricsTableWrapperAggregate.java |   15 +-
 .../regionserver/MetricsUserAggregateSource.java   |   10 +-
 .../hbase/regionserver/MetricsUserSource.java      |   11 +-
 .../hbase/regionserver/wal/MetricsWALSource.java   |   13 +-
 .../regionserver/MetricsReplicationSinkSource.java |   10 +-
 .../regionserver/MetricsReplicationSource.java     |    3 +-
 .../MetricsReplicationSourceFactory.java           |    6 +-
 .../MetricsReplicationSourceSource.java            |   39 +-
 .../MetricsReplicationTableSource.java             |    7 +-
 .../hadoop/hbase/rest/MetricsRESTSource.java       |   19 +-
 .../hbase/thrift/MetricsThriftServerSource.java    |    6 +-
 .../thrift/MetricsThriftServerSourceFactory.java   |    7 +-
 .../hbase/zookeeper/MetricsZooKeeperSource.java    |   11 +-
 .../apache/hadoop/metrics2/MetricHistogram.java    |   12 +-
 .../apache/hadoop/metrics2/MetricsExecutor.java    |    3 +-
 .../java/org/apache/hadoop/hbase/HadoopShims.java  |   12 +-
 .../apache/hadoop/hbase/RandomStringGenerator.java |    3 +-
 .../hadoop/hbase/RandomStringGeneratorImpl.java    |    8 +-
 .../hbase/TestCompatibilitySingletonFactory.java   |   13 +-
 .../master/TestMetricsMasterSourceFactory.java     |   12 +-
 .../TestMetricsRegionServerSourceFactory.java      |   12 +-
 .../regionserver/wal/TestMetricsWALSource.java     |   10 +-
 .../TestMetricsReplicationSourceFactory.java       |   12 +-
 .../hadoop/hbase/rest/TestMetricsRESTSource.java   |   12 +-
 .../hadoop/hbase/test/MetricsAssertHelper.java     |   81 +-
 .../TestMetricsThriftServerSourceFactory.java      |   11 +-
 .../zookeeper/TestMetricsZooKeeperSource.java      |   10 +-
 hbase-hadoop2-compat/pom.xml                       |  134 +-
 .../hadoop/hbase/io/MetricsIOSourceImpl.java       |   22 +-
 .../ipc/MetricsHBaseServerSourceFactoryImpl.java   |   21 +-
 .../hbase/ipc/MetricsHBaseServerSourceImpl.java    |  127 +-
 .../org/apache/hadoop/hbase/mapreduce/JobUtil.java |   13 +-
 .../master/MetricsAssignmentManagerSourceImpl.java |   33 +-
 .../master/MetricsMasterFilesystemSourceImpl.java  |   18 +-
 .../master/MetricsMasterProcSourceFactoryImpl.java |    3 +-
 .../hbase/master/MetricsMasterProcSourceImpl.java  |   31 +-
 .../MetricsMasterQuotaSourceFactoryImpl.java       |   15 +-
 .../hbase/master/MetricsMasterQuotaSourceImpl.java |   65 +-
 .../master/MetricsMasterSourceFactoryImpl.java     |    6 +-
 .../hbase/master/MetricsMasterSourceImpl.java      |   95 +-
 .../hbase/master/MetricsSnapshotSourceImpl.java    |   19 +-
 .../master/balancer/MetricsBalancerSourceImpl.java |   10 +-
 .../MetricsStochasticBalancerSourceImpl.java       |   24 +-
 .../hadoop/hbase/metrics/BaseSourceImpl.java       |   50 +-
 .../hbase/metrics/ExceptionTrackingSourceImpl.java |   65 +-
 .../org/apache/hadoop/hbase/metrics/Interns.java   |   34 +-
 .../hadoop/hbase/metrics/MBeanSourceImpl.java      |    6 +-
 .../hadoop/hbase/metrics/MetricsInfoImpl.java      |   26 +-
 .../impl/GlobalMetricRegistriesAdapter.java        |   22 +-
 .../impl/HBaseMetrics2HadoopMetricsAdapter.java    |   59 +-
 .../MetricsHeapMemoryManagerSourceImpl.java        |   78 +-
 .../MetricsRegionAggregateSourceImpl.java          |   25 +-
 .../MetricsRegionServerQuotaSourceImpl.java        |   22 +-
 .../MetricsRegionServerSourceFactoryImpl.java      |   11 +-
 .../MetricsRegionServerSourceImpl.java             |  556 ++--
 .../regionserver/MetricsRegionSourceImpl.java      |  176 +-
 .../MetricsTableAggregateSourceImpl.java           |   19 +-
 .../regionserver/MetricsTableLatenciesImpl.java    |   28 +-
 .../regionserver/MetricsTableQueryMeterImpl.java   |   24 +-
 .../hbase/regionserver/MetricsTableSourceImpl.java |  117 +-
 .../MetricsUserAggregateSourceImpl.java            |   12 +-
 .../hbase/regionserver/MetricsUserSourceImpl.java  |   38 +-
 .../regionserver/wal/MetricsWALSourceImpl.java     |   48 +-
 .../MetricsReplicationGlobalSourceSourceImpl.java  |   71 +-
 .../MetricsReplicationSinkSourceImpl.java          |   17 +-
 .../MetricsReplicationSourceFactoryImpl.java       |   13 +-
 .../regionserver/MetricsReplicationSourceImpl.java |   18 +-
 .../MetricsReplicationSourceSourceImpl.java        |   60 +-
 .../MetricsReplicationTableSourceImpl.java         |    5 +-
 .../hadoop/hbase/rest/MetricsRESTSourceImpl.java   |   22 +-
 .../MetricsThriftServerSourceFactoryImpl.java      |   12 +-
 .../thrift/MetricsThriftServerSourceImpl.java      |   26 +-
 .../zookeeper/MetricsZooKeeperSourceImpl.java      |   68 +-
 .../hadoop/metrics2/impl/JmxCacheBuster.java       |   17 +-
 .../metrics2/lib/DefaultMetricsSystemHelper.java   |   11 +-
 .../metrics2/lib/DynamicMetricsRegistry.java       |  240 +-
 .../hadoop/metrics2/lib/MetricsExecutorImpl.java   |   14 +-
 .../hadoop/metrics2/lib/MutableFastCounter.java    |    4 +-
 .../hadoop/metrics2/lib/MutableHistogram.java      |   30 +-
 .../hadoop/metrics2/lib/MutableRangeHistogram.java |   22 +-
 .../hadoop/metrics2/lib/MutableSizeHistogram.java  |    6 +-
 .../hadoop/metrics2/lib/MutableTimeHistogram.java  |    3 +-
 .../hadoop/metrics2/util/MetricQuantile.java       |    8 +-
 .../metrics2/util/MetricSampleQuantiles.java       |   78 +-
 .../org/apache/hadoop/hbase/HadoopShimsImpl.java   |    9 +-
 .../master/TestMetricsMasterProcSourceImpl.java    |   14 +-
 .../hbase/master/TestMetricsMasterSourceImpl.java  |   14 +-
 .../hadoop/hbase/metrics/TestBaseSourceImpl.java   |    8 +-
 .../regionserver/MetricsTableWrapperStub.java      |    1 -
 .../TestMetricsRegionServerSourceImpl.java         |   12 +-
 .../regionserver/TestMetricsRegionSourceImpl.java  |    9 +-
 .../regionserver/TestMetricsTableSourceImpl.java   |   23 +-
 .../regionserver/TestMetricsUserSourceImpl.java    |   18 +-
 .../regionserver/wal/TestMetricsWALSourceImpl.java |   12 +-
 .../TestMetricsReplicationSourceFactoryImpl.java   |    8 +-
 .../TestMetricsReplicationSourceImpl.java          |    8 +-
 .../hbase/rest/TestMetricsRESTSourceImpl.java      |    8 +-
 .../hadoop/hbase/test/MetricsAssertHelperImpl.java |   14 +-
 .../TestMetricsThriftServerSourceFactoryImpl.java  |   20 +-
 .../zookeeper/TestMetricsZooKeeperSourceImpl.java  |    6 +-
 .../metrics2/lib/TestMutableRangeHistogram.java    |    8 +-
 hbase-hbtop/pom.xml                                |   24 +-
 .../java/org/apache/hadoop/hbase/hbtop/HBTop.java  |   12 +-
 .../java/org/apache/hadoop/hbase/hbtop/Record.java |   18 +-
 .../apache/hadoop/hbase/hbtop/RecordFilter.java    |   18 +-
 .../org/apache/hadoop/hbase/hbtop/field/Field.java |    9 +-
 .../apache/hadoop/hbase/hbtop/field/FieldInfo.java |   13 +-
 .../hadoop/hbase/hbtop/field/FieldValue.java       |   39 +-
 .../hadoop/hbase/hbtop/field/FieldValueType.java   |   10 +-
 .../hbase/hbtop/mode/ClientModeStrategy.java       |  105 +-
 .../hadoop/hbase/hbtop/mode/DrillDownInfo.java     |    9 +-
 .../org/apache/hadoop/hbase/hbtop/mode/Mode.java   |    7 +-
 .../hadoop/hbase/hbtop/mode/ModeStrategy.java      |    9 +-
 .../hadoop/hbase/hbtop/mode/ModeStrategyUtils.java |   19 +-
 .../hbase/hbtop/mode/NamespaceModeStrategy.java    |   25 +-
 .../hbase/hbtop/mode/RegionModeStrategy.java       |   61 +-
 .../hbase/hbtop/mode/RegionServerModeStrategy.java |   52 +-
 .../hbase/hbtop/mode/RequestCountPerSecond.java    |    3 +-
 .../hadoop/hbase/hbtop/mode/TableModeStrategy.java |   37 +-
 .../hadoop/hbase/hbtop/mode/UserModeStrategy.java  |   41 +-
 .../hbase/hbtop/screen/AbstractScreenView.java     |    3 +-
 .../apache/hadoop/hbase/hbtop/screen/Screen.java   |   11 +-
 .../hadoop/hbase/hbtop/screen/ScreenView.java      |   11 +-
 .../hbtop/screen/field/FieldScreenPresenter.java   |   12 +-
 .../hbase/hbtop/screen/field/FieldScreenView.java  |   17 +-
 .../hbtop/screen/help/CommandDescription.java      |    4 +-
 .../hbtop/screen/help/HelpScreenPresenter.java     |   39 +-
 .../hbase/hbtop/screen/help/HelpScreenView.java    |    7 +-
 .../hbtop/screen/mode/ModeScreenPresenter.java     |    3 +-
 .../hbase/hbtop/screen/mode/ModeScreenView.java    |   19 +-
 .../top/FilterDisplayModeScreenPresenter.java      |    3 +-
 .../screen/top/FilterDisplayModeScreenView.java    |    7 +-
 .../hadoop/hbase/hbtop/screen/top/Header.java      |    5 +-
 .../hbtop/screen/top/InputModeScreenPresenter.java |    3 +-
 .../hbtop/screen/top/InputModeScreenView.java      |    7 +-
 .../screen/top/MessageModeScreenPresenter.java     |    7 +-
 .../hbtop/screen/top/MessageModeScreenView.java    |    6 +-
 .../hadoop/hbase/hbtop/screen/top/Paging.java      |    3 +-
 .../hadoop/hbase/hbtop/screen/top/Summary.java     |    7 +-
 .../hbase/hbtop/screen/top/TopScreenModel.java     |   20 +-
 .../hbase/hbtop/screen/top/TopScreenPresenter.java |   25 +-
 .../hbase/hbtop/screen/top/TopScreenView.java      |   51 +-
 .../hadoop/hbase/hbtop/terminal/Attributes.java    |    3 +-
 .../apache/hadoop/hbase/hbtop/terminal/Color.java  |   12 +-
 .../hbase/hbtop/terminal/CursorPosition.java       |    3 +-
 .../hadoop/hbase/hbtop/terminal/KeyPress.java      |   12 +-
 .../hadoop/hbase/hbtop/terminal/Terminal.java      |   20 +-
 .../hbase/hbtop/terminal/TerminalPrinter.java      |    3 +-
 .../hadoop/hbase/hbtop/terminal/TerminalSize.java  |    3 +-
 .../hadoop/hbase/hbtop/terminal/impl/Cell.java     |    3 +-
 .../hbase/hbtop/terminal/impl/EscapeSequences.java |    3 +-
 .../hbtop/terminal/impl/KeyPressGenerator.java     |   24 +-
 .../hbase/hbtop/terminal/impl/ScreenBuffer.java    |    9 +-
 .../hbase/hbtop/terminal/impl/TerminalImpl.java    |   23 +-
 .../hbtop/terminal/impl/TerminalPrinterImpl.java   |    2 +-
 .../hbtop/terminal/impl/batch/BatchTerminal.java   |   10 +-
 .../terminal/impl/batch/BatchTerminalPrinter.java  |    2 +-
 .../org/apache/hadoop/hbase/hbtop/TestRecord.java  |   34 +-
 .../hadoop/hbase/hbtop/TestRecordFilter.java       |   33 +-
 .../org/apache/hadoop/hbase/hbtop/TestUtils.java   |  201 +-
 .../hadoop/hbase/hbtop/field/TestFieldValue.java   |   33 +-
 .../hadoop/hbase/hbtop/mode/TestClientMode.java    |   16 +-
 .../hadoop/hbase/hbtop/mode/TestModeBase.java      |   10 +-
 .../hadoop/hbase/hbtop/mode/TestNamespaceMode.java |    6 +-
 .../hadoop/hbase/hbtop/mode/TestRegionMode.java    |    3 +-
 .../hbase/hbtop/mode/TestRegionServerMode.java     |    3 +-
 .../hbtop/mode/TestRequestCountPerSecond.java      |    3 +-
 .../hadoop/hbase/hbtop/mode/TestTableMode.java     |    6 +-
 .../hadoop/hbase/hbtop/mode/TestUserMode.java      |    2 +-
 .../screen/field/TestFieldScreenPresenter.java     |   23 +-
 .../hbtop/screen/help/TestHelpScreenPresenter.java |    7 +-
 .../hbtop/screen/mode/TestModeScreenPresenter.java |    5 +-
 .../top/TestFilterDisplayModeScreenPresenter.java  |   20 +-
 .../screen/top/TestInputModeScreenPresenter.java   |    7 +-
 .../screen/top/TestMessageModeScreenPresenter.java |    7 +-
 .../hadoop/hbase/hbtop/screen/top/TestPaging.java  |    6 +-
 .../hbase/hbtop/screen/top/TestTopScreenModel.java |   14 +-
 .../hbtop/screen/top/TestTopScreenPresenter.java   |   51 +-
 .../hbase/hbtop/terminal/impl/TestCursor.java      |    4 +-
 .../hbase/hbtop/terminal/impl/TestKeyPress.java    |    4 +-
 .../hbtop/terminal/impl/TestTerminalPrinter.java   |    8 +-
 hbase-http/pom.xml                                 |  225 +-
 .../hadoop/hbase/http/AdminAuthorizedFilter.java   |   19 +-
 .../hadoop/hbase/http/AdminAuthorizedServlet.java  |    5 +-
 .../hbase/http/ClickjackingPreventionFilter.java   |   11 +-
 .../apache/hadoop/hbase/http/FilterContainer.java  |   15 +-
 .../hadoop/hbase/http/FilterInitializer.java       |    4 +-
 .../org/apache/hadoop/hbase/http/HtmlQuoting.java  |   42 +-
 .../org/apache/hadoop/hbase/http/HttpConfig.java   |    7 +-
 .../apache/hadoop/hbase/http/HttpRequestLog.java   |    2 +-
 .../org/apache/hadoop/hbase/http/HttpServer.java   |  577 ++--
 .../apache/hadoop/hbase/http/HttpServerUtil.java   |    9 +-
 .../org/apache/hadoop/hbase/http/InfoServer.java   |   90 +-
 .../apache/hadoop/hbase/http/NoCacheFilter.java    |    7 +-
 .../hadoop/hbase/http/ProfileOutputServlet.java    |    6 +-
 .../apache/hadoop/hbase/http/ProfileServlet.java   |  117 +-
 .../hbase/http/ProxyUserAuthenticationFilter.java  |   87 +-
 .../hadoop/hbase/http/SecurityHeadersFilter.java   |   17 +-
 .../hadoop/hbase/http/ServerConfigurationKeys.java |   11 +-
 .../apache/hadoop/hbase/http/conf/ConfServlet.java |   20 +-
 .../hbase/http/gson/ByteArraySerializer.java       |    1 +
 .../hbase/http/gson/GsonMessageBodyWriter.java     |   22 +-
 .../hbase/http/jersey/ResponseEntityMapper.java    |    7 +-
 .../hbase/http/jersey/SupplierFactoryAdapter.java  |    8 +-
 .../hadoop/hbase/http/jmx/JMXJsonServlet.java      |  112 +-
 .../hadoop/hbase/http/lib/StaticUserWebFilter.java |   33 +-
 .../org/apache/hadoop/hbase/http/log/LogLevel.java |  146 +-
 .../org/apache/hadoop/hbase/util/JSONBean.java     |   34 +-
 .../apache/hadoop/hbase/util/JSONMetricUtil.java   |   20 +-
 .../apache/hadoop/hbase/util/LogMonitoring.java    |    3 +-
 .../org/apache/hadoop/hbase/util/ProcessUtils.java |    5 +-
 .../hbase/http/HttpServerFunctionalTest.java       |  120 +-
 .../apache/hadoop/hbase/http/TestGlobalFilter.java |   31 +-
 .../apache/hadoop/hbase/http/TestHtmlQuoting.java  |   36 +-
 .../hadoop/hbase/http/TestHttpCookieFlag.java      |  102 +-
 .../hadoop/hbase/http/TestHttpRequestLog.java      |    2 +-
 .../apache/hadoop/hbase/http/TestHttpServer.java   |  202 +-
 .../hadoop/hbase/http/TestHttpServerLifecycle.java |   41 +-
 .../hadoop/hbase/http/TestHttpServerWebapps.java   |   10 +-
 .../apache/hadoop/hbase/http/TestPathFilter.java   |   27 +-
 .../hbase/http/TestProfileOutputServlet.java       |   11 +-
 .../hbase/http/TestProxyUserSpnegoHttpServer.java  |   95 +-
 .../hadoop/hbase/http/TestSSLHttpServer.java       |   32 +-
 .../hbase/http/TestSecurityHeadersFilter.java      |   43 +-
 .../hadoop/hbase/http/TestServletFilter.java       |   56 +-
 .../hadoop/hbase/http/TestSpnegoHttpServer.java    |   68 +-
 .../hadoop/hbase/http/conf/TestConfServlet.java    |   26 +-
 .../hadoop/hbase/http/jmx/TestJMXJsonServlet.java  |   72 +-
 .../hbase/http/lib/TestStaticUserWebFilter.java    |   15 +-
 .../apache/hadoop/hbase/http/log/TestLogLevel.java |   34 +-
 .../hadoop/hbase/http/resource/JerseyResource.java |   15 +-
 .../hadoop/hbase/http/ssl/KeyStoreTestUtil.java    |  273 +-
 .../org/apache/hadoop/hbase/util/TestJSONBean.java |   27 +-
 hbase-it/pom.xml                                   |  273 +-
 .../org/apache/hadoop/hbase/chaos/ChaosAgent.java  |  216 +-
 .../apache/hadoop/hbase/chaos/ChaosConstants.java  |   33 +-
 .../apache/hadoop/hbase/chaos/ChaosService.java    |   27 +-
 .../org/apache/hadoop/hbase/chaos/ChaosUtils.java  |    8 +-
 .../org/apache/hadoop/hbase/ChaosZKClient.java     |   92 +-
 .../org/apache/hadoop/hbase/ClusterManager.java    |   29 +-
 .../apache/hadoop/hbase/CoprocClusterManager.java  |   41 +-
 .../hadoop/hbase/DistributedHBaseCluster.java      |  134 +-
 .../apache/hadoop/hbase/HBaseClusterManager.java   |  133 +-
 .../hbase/IntegrationTestAcidGuarantees.java       |    9 +-
 .../apache/hadoop/hbase/IntegrationTestBase.java   |   44 +-
 .../hbase/IntegrationTestDDLMasterFailover.java    |  376 ++-
 .../apache/hadoop/hbase/IntegrationTestIngest.java |   70 +-
 .../IntegrationTestIngestStripeCompactions.java    |    8 +-
 .../hadoop/hbase/IntegrationTestIngestWithACL.java |   18 +-
 .../hbase/IntegrationTestIngestWithEncryption.java |   11 +-
 .../hadoop/hbase/IntegrationTestIngestWithMOB.java |   25 +-
 .../hbase/IntegrationTestIngestWithTags.java       |    5 +-
 .../IntegrationTestIngestWithVisibilityLabels.java |   17 +-
 .../hadoop/hbase/IntegrationTestLazyCfLoading.java |   44 +-
 .../hadoop/hbase/IntegrationTestManyRegions.java   |   51 +-
 .../hadoop/hbase/IntegrationTestMetaReplicas.java  |   25 +-
 .../hbase/IntegrationTestRegionReplicaPerf.java    |   91 +-
 .../IntegrationTestRegionReplicaReplication.java   |   61 +-
 .../hadoop/hbase/IntegrationTestingUtility.java    |   69 +-
 .../hadoop/hbase/IntegrationTestsDriver.java       |   31 +-
 .../org/apache/hadoop/hbase/MockHttpApiRule.java   |   31 +-
 .../apache/hadoop/hbase/RESTApiClusterManager.java |  261 +-
 .../hadoop/hbase/ShellExecEndpointCoprocessor.java |   57 +-
 .../StripeCompactionsPerformanceEvaluation.java    |   68 +-
 .../hadoop/hbase/TestIntegrationTestBase.java      |    4 +-
 .../hadoop/hbase/TestRESTApiClusterManager.java    |   51 +-
 .../hbase/TestShellExecEndpointCoprocessor.java    |   44 +-
 .../apache/hadoop/hbase/ZNodeClusterManager.java   |   28 +-
 .../apache/hadoop/hbase/chaos/actions/Action.java  |   89 +-
 .../hbase/chaos/actions/AddCPULoadAction.java      |   19 +-
 .../hbase/chaos/actions/AddColumnAction.java       |   17 +-
 .../hbase/chaos/actions/BatchRestartRsAction.java  |   23 +-
 .../chaos/actions/ChangeBloomFilterAction.java     |   11 +-
 .../chaos/actions/ChangeCompressionAction.java     |    8 +-
 .../hbase/chaos/actions/ChangeEncodingAction.java  |    6 +-
 .../chaos/actions/ChangeSplitPolicyAction.java     |   12 +-
 .../hbase/chaos/actions/ChangeVersionsAction.java  |   11 +-
 .../hbase/chaos/actions/CompactMobAction.java      |    4 +-
 .../actions/CompactRandomRegionOfTableAction.java  |   11 +-
 .../hbase/chaos/actions/CompactTableAction.java    |    7 +-
 .../chaos/actions/CorruptDataFilesAction.java      |   12 +-
 .../chaos/actions/CorruptPacketsCommandAction.java |   17 +-
 .../chaos/actions/DecreaseMaxHFileSizeAction.java  |   14 +-
 .../chaos/actions/DelayPacketsCommandAction.java   |   18 +-
 .../hbase/chaos/actions/DeleteDataFilesAction.java |   12 +-
 .../chaos/actions/DumpClusterStatusAction.java     |   26 +-
 .../actions/DuplicatePacketsCommandAction.java     |   17 +-
 .../hbase/chaos/actions/FillDiskCommandAction.java |   29 +-
 .../actions/FlushRandomRegionOfTableAction.java    |   16 +-
 .../hbase/chaos/actions/FlushTableAction.java      |    8 +-
 .../hbase/chaos/actions/ForceBalancerAction.java   |    8 +-
 .../actions/GracefulRollingRestartRsAction.java    |   14 +-
 .../chaos/actions/LosePacketsCommandAction.java    |   17 +-
 .../MergeRandomAdjacentRegionsOfTableAction.java   |    6 +-
 .../actions/MoveRandomRegionOfTableAction.java     |   15 +-
 .../chaos/actions/MoveRegionsOfTableAction.java    |   13 +-
 .../hbase/chaos/actions/RemoveColumnAction.java    |   17 +-
 .../chaos/actions/ReorderPacketsCommandAction.java |   23 +-
 .../chaos/actions/RestartActionBaseAction.java     |    7 +-
 .../chaos/actions/RestartActiveMasterAction.java   |    8 +-
 .../chaos/actions/RestartActiveNameNodeAction.java |   10 +-
 .../chaos/actions/RestartRandomDataNodeAction.java |   16 +-
 .../hbase/chaos/actions/RestartRandomRsAction.java |    4 +-
 .../actions/RestartRandomRsExceptMetaAction.java   |    4 +-
 .../chaos/actions/RestartRandomZKNodeAction.java   |   14 +-
 .../chaos/actions/RestartRsHoldingMetaAction.java  |   11 +-
 .../chaos/actions/RestartRsHoldingTableAction.java |   15 +-
 .../chaos/actions/RollingBatchRestartRsAction.java |   22 +-
 .../actions/RollingBatchSuspendResumeRsAction.java |   18 +-
 .../hbase/chaos/actions/SnapshotTableAction.java   |    8 +-
 .../chaos/actions/SplitAllRegionOfTableAction.java |    9 +-
 .../actions/SplitRandomRegionOfTableAction.java    |   14 +-
 .../hbase/chaos/actions/SudoCommandAction.java     |    9 +-
 .../hbase/chaos/actions/TCCommandAction.java       |    3 +-
 .../chaos/actions/TestChangeSplitPolicyAction.java |    6 +-
 .../hbase/chaos/actions/TruncateTableAction.java   |    4 +-
 .../actions/UnbalanceKillAndRebalanceAction.java   |   34 +-
 .../chaos/actions/UnbalanceRegionsAction.java      |   14 +-
 .../hbase/chaos/factories/CalmMonkeyFactory.java   |    4 +-
 ...ConfigurableSlowDeterministicMonkeyFactory.java |   45 +-
 .../chaos/factories/DataIssuesMonkeyFactory.java   |   35 +-
 .../factories/DistributedIssuesMonkeyFactory.java  |  109 +-
 .../factories/MasterKillingMonkeyFactory.java      |   32 +-
 .../chaos/factories/MobNoKillMonkeyFactory.java    |   31 +-
 .../MobSlowDeterministicMonkeyFactory.java         |  154 +-
 .../hbase/chaos/factories/MonkeyConstants.java     |    8 +-
 .../hbase/chaos/factories/MonkeyFactory.java       |   18 +-
 .../hbase/chaos/factories/NoKillMonkeyFactory.java |   59 +-
 .../ServerAndDependenciesKillingMonkeyFactory.java |   28 +-
 .../factories/ServerKillingMonkeyFactory.java      |   30 +-
 .../factories/SlowDeterministicMonkeyFactory.java  |  140 +-
 .../StressAssignmentManagerMonkeyFactory.java      |   77 +-
 .../chaos/factories/UnbalanceMonkeyFactory.java    |   45 +-
 .../hbase/chaos/monkies/CalmChaosMonkey.java       |    3 +-
 .../hadoop/hbase/chaos/monkies/ChaosMonkey.java    |   29 +-
 .../chaos/monkies/PolicyBasedChaosMonkey.java      |   23 +-
 .../chaos/policies/CompositeSequentialPolicy.java  |    2 +-
 .../hbase/chaos/policies/DoActionsOncePolicy.java  |    8 +-
 .../hbase/chaos/policies/PeriodicPolicy.java       |    5 +-
 .../chaos/policies/PeriodicRandomActionPolicy.java |    8 +-
 .../apache/hadoop/hbase/chaos/policies/Policy.java |    4 +-
 .../chaos/policies/TwoConcurrentActionPolicy.java  |   21 +-
 .../hadoop/hbase/chaos/util/ChaosMonkeyRunner.java |   44 +-
 .../apache/hadoop/hbase/chaos/util/Monkeys.java    |    8 +-
 .../hadoop/hbase/ipc/IntegrationTestRpcClient.java |   40 +-
 .../hbase/mapreduce/IntegrationTestBulkLoad.java   |  225 +-
 .../IntegrationTestFileBasedSFTBulkLoad.java       |   50 +-
 .../hbase/mapreduce/IntegrationTestImportTsv.java  |   75 +-
 .../IntegrationTestTableMapReduceUtil.java         |    9 +-
 .../IntegrationTestTableSnapshotInputFormat.java   |   79 +-
 .../hadoop/hbase/mttr/IntegrationTestMTTR.java     |  155 +-
 .../hbase/test/IntegrationTestBigLinkedList.java   |  595 ++---
 ...IntegrationTestBigLinkedListWithVisibility.java |  145 +-
 .../hbase/test/IntegrationTestLoadAndVerify.java   |  232 +-
 .../hbase/test/IntegrationTestLoadCommonCrawl.java |  215 +-
 .../hadoop/hbase/test/IntegrationTestMonkeys.java  |    7 +-
 .../hbase/test/IntegrationTestReplication.java     |  191 +-
 ...eBoundedMultiGetRequestsWithRegionReplicas.java |   32 +-
 ...nTestTimeBoundedRequestsWithRegionReplicas.java |  117 +-
 ...grationTestWithCellVisibilityLoadAndVerify.java |  100 +-
 .../test/IntegrationTestZKAndFSPermissions.java    |   42 +-
 .../org/apache/hadoop/hbase/test/util/CRC64.java   |    5 +-
 .../hbase/test/util/warc/WARCFileReader.java       |   50 +-
 .../hbase/test/util/warc/WARCFileWriter.java       |  128 +-
 .../hbase/test/util/warc/WARCInputFormat.java      |   49 +-
 .../hbase/test/util/warc/WARCOutputFormat.java     |   48 +-
 .../hadoop/hbase/test/util/warc/WARCRecord.java    |  269 +-
 .../hadoop/hbase/test/util/warc/WARCWritable.java  |   36 +-
 .../trace/IntegrationTestSendTraceRequests.java    |   15 +-
 hbase-logging/pom.xml                              |   68 +-
 .../hadoop/hbase/logging/InternalLog4jUtils.java   |    2 +-
 .../hbase/logging/JulToSlf4jInitializer.java       |    2 +-
 .../apache/hadoop/hbase/logging/Log4jUtils.java    |    2 +-
 .../hadoop/hbase/logging/HBaseTestAppender.java    |   10 +-
 .../org/apache/hadoop/hbase/logging/Target.java    |    2 +-
 .../test/java/org/apache/log4j/FileAppender.java   |    3 +-
 hbase-mapreduce/pom.xml                            |   89 +-
 .../org/apache/hadoop/hbase/mapred/Driver.java     |   13 +-
 .../hadoop/hbase/mapred/GroupingTableMap.java      |   92 +-
 .../hadoop/hbase/mapred/HRegionPartitioner.java    |   29 +-
 .../hadoop/hbase/mapred/IdentityTableMap.java      |   40 +-
 .../hadoop/hbase/mapred/IdentityTableReduce.java   |   31 +-
 .../mapred/MultiTableSnapshotInputFormat.java      |   72 +-
 .../org/apache/hadoop/hbase/mapred/RowCounter.java |   41 +-
 .../hadoop/hbase/mapred/TableInputFormat.java      |   20 +-
 .../hadoop/hbase/mapred/TableInputFormatBase.java  |  126 +-
 .../org/apache/hadoop/hbase/mapred/TableMap.java   |   12 +-
 .../hadoop/hbase/mapred/TableMapReduceUtil.java    |  286 +-
 .../hadoop/hbase/mapred/TableOutputFormat.java     |   34 +-
 .../hadoop/hbase/mapred/TableRecordReader.java     |   40 +-
 .../hadoop/hbase/mapred/TableRecordReaderImpl.java |   58 +-
 .../apache/hadoop/hbase/mapred/TableReduce.java    |    8 +-
 .../hbase/mapred/TableSnapshotInputFormat.java     |   57 +-
 .../org/apache/hadoop/hbase/mapred/TableSplit.java |   66 +-
 .../apache/hadoop/hbase/mapreduce/CellCounter.java |   95 +-
 .../apache/hadoop/hbase/mapreduce/CellCreator.java |  109 +-
 .../hadoop/hbase/mapreduce/CellSerialization.java  |    9 +-
 .../hadoop/hbase/mapreduce/CellSortReducer.java    |   18 +-
 .../apache/hadoop/hbase/mapreduce/CopyTable.java   |   81 +-
 .../DefaultVisibilityExpressionResolver.java       |   13 +-
 .../org/apache/hadoop/hbase/mapreduce/Driver.java  |   38 +-
 .../org/apache/hadoop/hbase/mapreduce/Export.java  |   56 +-
 .../apache/hadoop/hbase/mapreduce/ExportUtils.java |   48 +-
 .../hbase/mapreduce/GroupingTableMapper.java       |   91 +-
 .../hadoop/hbase/mapreduce/HFileInputFormat.java   |   20 +-
 .../hadoop/hbase/mapreduce/HFileOutputFormat2.java |  415 ++-
 .../hadoop/hbase/mapreduce/HRegionPartitioner.java |   79 +-
 .../apache/hadoop/hbase/mapreduce/HashTable.java   |   89 +-
 .../hbase/mapreduce/IdentityTableMapper.java       |   38 +-
 .../hbase/mapreduce/IdentityTableReducer.java      |   61 +-
 .../org/apache/hadoop/hbase/mapreduce/Import.java  |  330 ++-
 .../apache/hadoop/hbase/mapreduce/ImportTsv.java   |  271 +-
 .../apache/hadoop/hbase/mapreduce/JarFinder.java   |   59 +-
 .../hbase/mapreduce/KeyValueSerialization.java     |   14 +-
 .../hbase/mapreduce/KeyValueSortReducer.java       |   25 +-
 .../mapreduce/MultiTableHFileOutputFormat.java     |   72 +-
 .../hbase/mapreduce/MultiTableInputFormat.java     |   28 +-
 .../hbase/mapreduce/MultiTableInputFormatBase.java |  137 +-
 .../hbase/mapreduce/MultiTableOutputFormat.java    |   90 +-
 .../mapreduce/MultiTableSnapshotInputFormat.java   |   63 +-
 .../MultiTableSnapshotInputFormatImpl.java         |   66 +-
 .../hbase/mapreduce/MultithreadedTableMapper.java  |  131 +-
 .../hbase/mapreduce/MutationSerialization.java     |   13 +-
 .../apache/hadoop/hbase/mapreduce/PutCombiner.java |   24 +-
 .../hadoop/hbase/mapreduce/PutSortReducer.java     |   47 +-
 .../hbase/mapreduce/RegionSizeCalculator.java      |   28 +-
 .../hbase/mapreduce/ResultSerialization.java       |   14 +-
 .../mapreduce/RoundRobinTableInputFormat.java      |   44 +-
 .../apache/hadoop/hbase/mapreduce/RowCounter.java  |  174 +-
 .../mapreduce/SimpleTotalOrderPartitioner.java     |   54 +-
 .../apache/hadoop/hbase/mapreduce/SyncTable.java   |  230 +-
 .../hadoop/hbase/mapreduce/TableInputFormat.java   |   94 +-
 .../hbase/mapreduce/TableInputFormatBase.java      |  288 +-
 .../hadoop/hbase/mapreduce/TableMapReduceUtil.java |  850 +++---
 .../apache/hadoop/hbase/mapreduce/TableMapper.java |   15 +-
 .../hbase/mapreduce/TableOutputCommitter.java      |   10 +-
 .../hadoop/hbase/mapreduce/TableOutputFormat.java  |   93 +-
 .../hadoop/hbase/mapreduce/TableRecordReader.java  |   49 +-
 .../hbase/mapreduce/TableRecordReaderImpl.java     |  104 +-
 .../hadoop/hbase/mapreduce/TableReducer.java       |   29 +-
 .../hbase/mapreduce/TableSnapshotInputFormat.java  |  119 +-
 .../mapreduce/TableSnapshotInputFormatImpl.java    |  148 +-
 .../apache/hadoop/hbase/mapreduce/TableSplit.java  |  157 +-
 .../hadoop/hbase/mapreduce/TextSortReducer.java    |   63 +-
 .../hadoop/hbase/mapreduce/TsvImporterMapper.java  |   74 +-
 .../hbase/mapreduce/TsvImporterTextMapper.java     |   36 +-
 .../mapreduce/VisibilityExpressionResolver.java    |    5 +-
 .../hadoop/hbase/mapreduce/WALInputFormat.java     |   64 +-
 .../apache/hadoop/hbase/mapreduce/WALPlayer.java   |  119 +-
 .../mapreduce/replication/VerifyReplication.java   |  273 +-
 .../hadoop/hbase/mob/mapreduce/MobRefReporter.java |  126 +-
 .../hadoop/hbase/regionserver/CompactionTool.java  |  107 +-
 .../hadoop/hbase/snapshot/ExportSnapshot.java      |  357 +--
 .../util/MapreduceDependencyClasspathTool.java     |   16 +-
 .../apache/hadoop/hbase/PerformanceEvaluation.java |  641 +++--
 .../hadoop/hbase/ScanPerformanceEvaluation.java    |  158 +-
 .../hadoop/hbase/TestPerformanceEvaluation.java    |   24 +-
 .../org/apache/hadoop/hbase/mapred/TestDriver.java |    9 +-
 .../hadoop/hbase/mapred/TestGroupingTableMap.java  |   72 +-
 .../hadoop/hbase/mapred/TestIdentityTableMap.java  |   17 +-
 .../mapred/TestMultiTableSnapshotInputFormat.java  |   40 +-
 .../apache/hadoop/hbase/mapred/TestRowCounter.java |   45 +-
 .../apache/hadoop/hbase/mapred/TestSplitTable.java |   35 +-
 .../hadoop/hbase/mapred/TestTableInputFormat.java  |  116 +-
 .../hadoop/hbase/mapred/TestTableMapReduce.java    |   32 +-
 .../hbase/mapred/TestTableMapReduceUtil.java       |   90 +-
 .../TestTableOutputFormatConnectionExhaust.java    |   21 +-
 .../hbase/mapred/TestTableSnapshotInputFormat.java |   90 +-
 .../mapreduce/MultiTableInputFormatTestBase.java   |   84 +-
 .../hadoop/hbase/mapreduce/NMapInputFormat.java    |   20 +-
 .../TableSnapshotInputFormatTestBase.java          |   36 +-
 .../mapreduce/TestCellBasedHFileOutputFormat2.java |  562 ++--
 .../mapreduce/TestCellBasedImportExport2.java      |  347 +--
 .../hbase/mapreduce/TestCellBasedWALPlayer2.java   |   31 +-
 .../hadoop/hbase/mapreduce/TestCellCounter.java    |   31 +-
 .../hadoop/hbase/mapreduce/TestCopyTable.java      |   84 +-
 .../hbase/mapreduce/TestGroupingTableMapper.java   |   16 +-
 .../hbase/mapreduce/TestHBaseMRTestingUtility.java |   35 +-
 .../hbase/mapreduce/TestHFileOutputFormat2.java    |  585 ++---
 .../hbase/mapreduce/TestHRegionPartitioner.java    |   10 +-
 .../hadoop/hbase/mapreduce/TestHashTable.java      |   68 +-
 .../hadoop/hbase/mapreduce/TestImportExport.java   |  402 ++-
 .../TestImportTSVWithOperationAttributes.java      |   65 +-
 .../hbase/mapreduce/TestImportTSVWithTTLs.java     |   29 +-
 .../TestImportTSVWithVisibilityLabels.java         |  167 +-
 .../hadoop/hbase/mapreduce/TestImportTsv.java      |  199 +-
 .../hbase/mapreduce/TestImportTsvParser.java       |   22 +-
 .../hadoop/hbase/mapreduce/TestJarFinder.java      |   26 +-
 .../hbase/mapreduce/TestMultiTableInputFormat.java |   19 +-
 .../mapreduce/TestMultiTableInputFormatBase.java   |   89 +-
 .../TestMultiTableSnapshotInputFormat.java         |   12 +-
 .../TestMultiTableSnapshotInputFormatImpl.java     |   34 +-
 .../mapreduce/TestMultithreadedTableMapper.java    |  111 +-
 .../hbase/mapreduce/TestRegionSizeCalculator.java  |   52 +-
 .../mapreduce/TestRoundRobinTableInputFormat.java  |   55 +-
 .../hadoop/hbase/mapreduce/TestRowCounter.java     |  286 +-
 .../mapreduce/TestSimpleTotalOrderPartitioner.java |   15 +-
 .../hadoop/hbase/mapreduce/TestSyncTable.java      |  149 +-
 .../hbase/mapreduce/TestTableInputFormat.java      |  170 +-
 .../hbase/mapreduce/TestTableInputFormatBase.java  |   96 +-
 .../hbase/mapreduce/TestTableInputFormatScan.java  |    6 +-
 .../mapreduce/TestTableInputFormatScanBase.java    |   63 +-
 .../TestTableInputFormatScanEmptyToAPP.java        |    4 +-
 .../TestTableInputFormatScanEmptyToBBA.java        |    4 +-
 .../TestTableInputFormatScanEmptyToBBB.java        |    4 +-
 .../TestTableInputFormatScanEmptyToEmpty.java      |    4 +-
 .../TestTableInputFormatScanEmptyToOPP.java        |    4 +-
 .../TestTableInputFormatScanOBBToOPP.java          |    2 +-
 .../TestTableInputFormatScanOBBToQPP.java          |    2 +-
 .../TestTableInputFormatScanOPPToEmpty.java        |    4 +-
 .../TestTableInputFormatScanYYXToEmpty.java        |    4 +-
 .../TestTableInputFormatScanYYYToEmpty.java        |    4 +-
 .../TestTableInputFormatScanYZYToEmpty.java        |    4 +-
 .../hadoop/hbase/mapreduce/TestTableMapReduce.java |   57 +-
 .../hbase/mapreduce/TestTableMapReduceBase.java    |   61 +-
 .../hbase/mapreduce/TestTableMapReduceUtil.java    |   45 +-
 .../hbase/mapreduce/TestTableRecordReader.java     |   15 +-
 .../mapreduce/TestTableSnapshotInputFormat.java    |  146 +-
 .../hadoop/hbase/mapreduce/TestTableSplit.java     |   62 +-
 .../hbase/mapreduce/TestTimeRangeMapRed.java       |   51 +-
 .../hadoop/hbase/mapreduce/TestWALInputFormat.java |    3 +-
 .../hadoop/hbase/mapreduce/TestWALPlayer.java      |   35 +-
 .../hbase/mapreduce/TestWALRecordReader.java       |   61 +-
 .../mapreduce/TsvImporterCustomTestMapper.java     |   29 +-
 .../TsvImporterCustomTestMapperForOprAttr.java     |   14 +-
 .../hbase/regionserver/TestCompactionTool.java     |    8 +-
 .../hbase/replication/TestVerifyReplication.java   |   43 +-
 .../replication/TestVerifyReplicationAdjunct.java  |   24 +-
 .../TestVerifyReplicationCrossDiffHdfs.java        |   19 +-
 ...tVerifyReplicationSecureClusterCredentials.java |   35 +-
 .../hadoop/hbase/snapshot/TestExportSnapshot.java  |   74 +-
 .../hbase/snapshot/TestExportSnapshotAdjunct.java  |   36 +-
 .../hbase/snapshot/TestExportSnapshotHelpers.java  |   45 +-
 .../snapshot/TestExportSnapshotV1NoCluster.java    |   41 +-
 .../snapshot/TestExportSnapshotV2NoCluster.java    |   10 +-
 .../TestExportSnapshotWithTemporaryDirectory.java  |   14 +-
 .../hbase/snapshot/TestMobExportSnapshot.java      |    6 +-
 .../snapshot/TestMobSecureExportSnapshot.java      |    6 +-
 .../hbase/snapshot/TestSecureExportSnapshot.java   |    6 +-
 .../org/apache/hadoop/hbase/util/LoadTestTool.java |  286 +-
 hbase-mapreduce/src/test/resources/mapred-site.xml |    1 -
 hbase-metrics-api/README.txt                       |    2 +-
 hbase-metrics-api/pom.xml                          |   92 +-
 .../org/apache/hadoop/hbase/metrics/Counter.java   |    4 +-
 .../org/apache/hadoop/hbase/metrics/Gauge.java     |    3 +-
 .../org/apache/hadoop/hbase/metrics/Histogram.java |    4 +-
 .../org/apache/hadoop/hbase/metrics/Meter.java     |   14 +-
 .../org/apache/hadoop/hbase/metrics/Metric.java    |    2 +-
 .../hadoop/hbase/metrics/MetricRegistries.java     |   11 +-
 .../hbase/metrics/MetricRegistriesLoader.java      |   15 +-
 .../hadoop/hbase/metrics/MetricRegistry.java       |   12 +-
 .../hbase/metrics/MetricRegistryFactory.java       |    7 +-
 .../hadoop/hbase/metrics/MetricRegistryInfo.java   |   35 +-
 .../org/apache/hadoop/hbase/metrics/MetricSet.java |    6 +-
 .../apache/hadoop/hbase/metrics/PackageMarker.java |   19 +-
 .../org/apache/hadoop/hbase/metrics/Snapshot.java  |   19 +-
 .../org/apache/hadoop/hbase/metrics/Timer.java     |    5 +-
 .../hbase/metrics/TestMetricRegistriesLoader.java  |    8 +-
 hbase-metrics/README.txt                           |    2 +-
 hbase-metrics/pom.xml                              |   92 +-
 .../hadoop/hbase/metrics/impl/CounterImpl.java     |    3 +-
 .../hadoop/hbase/metrics/impl/DropwizardMeter.java |   10 +-
 .../hbase/metrics/impl/FastLongHistogram.java      |   16 +-
 .../hadoop/hbase/metrics/impl/HistogramImpl.java   |   10 +-
 .../hbase/metrics/impl/MetricRegistriesImpl.java   |    6 +-
 .../metrics/impl/MetricRegistryFactoryImpl.java    |    5 +-
 .../hbase/metrics/impl/MetricRegistryImpl.java     |    5 +-
 .../hadoop/hbase/metrics/impl/RefCountingMap.java  |   18 +-
 .../hadoop/hbase/metrics/impl/TimerImpl.java       |    3 +-
 .../hadoop/hbase/metrics/impl/TestCounterImpl.java |   10 +-
 .../hbase/metrics/impl/TestDropwizardMeter.java    |   10 +-
 .../hbase/metrics/impl/TestFastLongHistogram.java  |    9 +-
 .../hadoop/hbase/metrics/impl/TestGauge.java       |   12 +-
 .../hbase/metrics/impl/TestHistogramImpl.java      |    4 +-
 .../hbase/metrics/impl/TestMetricRegistryImpl.java |   15 +-
 .../hbase/metrics/impl/TestRefCountingMap.java     |    9 +-
 .../hadoop/hbase/metrics/impl/TestTimerImpl.java   |    4 +-
 hbase-procedure/pom.xml                            |   73 +-
 .../procedure2/AbstractProcedureScheduler.java     |   37 +-
 .../procedure2/CompletedProcedureCleaner.java      |    8 +-
 .../procedure2/CompletedProcedureRetainer.java     |    8 +-
 .../hadoop/hbase/procedure2/DelayedProcedure.java  |    4 +-
 .../hadoop/hbase/procedure2/FailedProcedure.java   |    6 +-
 .../procedure2/FailedRemoteDispatchException.java  |    3 +-
 .../hadoop/hbase/procedure2/InlineChore.java       |    2 +-
 .../hadoop/hbase/procedure2/LockAndQueue.java      |   13 +-
 .../apache/hadoop/hbase/procedure2/LockStatus.java |    3 +-
 .../apache/hadoop/hbase/procedure2/LockType.java   |    4 +-
 .../hadoop/hbase/procedure2/LockedResource.java    |    7 +-
 .../hbase/procedure2/LockedResourceType.java       |   10 +-
 .../hbase/procedure2/NoNodeDispatchException.java  |    5 +-
 .../procedure2/NoServerDispatchException.java      |    5 +-
 .../NullTargetServerDispatchException.java         |    6 +-
 .../hadoop/hbase/procedure2/OnePhaseProcedure.java |    3 +-
 .../apache/hadoop/hbase/procedure2/Procedure.java  |  227 +-
 .../procedure2/ProcedureAbortedException.java      |    3 +-
 .../hadoop/hbase/procedure2/ProcedureDeque.java    |   11 +-
 .../hadoop/hbase/procedure2/ProcedureEvent.java    |   40 +-
 .../hbase/procedure2/ProcedureException.java       |    2 +-
 .../hadoop/hbase/procedure2/ProcedureExecutor.java |  392 ++-
 .../hbase/procedure2/ProcedureInMemoryChore.java   |   20 +-
 .../hadoop/hbase/procedure2/ProcedureMetrics.java  |   12 +-
 .../hbase/procedure2/ProcedureScheduler.java       |   25 +-
 .../hbase/procedure2/ProcedureStateSerializer.java |    1 -
 .../procedure2/ProcedureSuspendedException.java    |    2 +-
 .../hadoop/hbase/procedure2/ProcedureUtil.java     |   68 +-
 .../hbase/procedure2/ProcedureYieldException.java  |    3 +-
 .../procedure2/RemoteProcedureDispatcher.java      |   77 +-
 .../hbase/procedure2/RemoteProcedureException.java |   27 +-
 .../hbase/procedure2/RootProcedureState.java       |   37 +-
 .../hbase/procedure2/SequentialProcedure.java      |   26 +-
 .../hbase/procedure2/SimpleProcedureScheduler.java |    6 +-
 .../hbase/procedure2/StateMachineProcedure.java    |   60 +-
 .../hadoop/hbase/procedure2/StoppableThread.java   |    2 +-
 .../hbase/procedure2/TimeoutExecutorThread.java    |    5 +-
 .../hadoop/hbase/procedure2/TwoPhaseProcedure.java |    3 +-
 .../store/InMemoryProcedureIterator.java           |    4 +-
 .../hbase/procedure2/store/LeaseRecovery.java      |    4 +-
 .../hbase/procedure2/store/NoopProcedureStore.java |    3 +-
 .../hbase/procedure2/store/ProcedureStore.java     |   55 +-
 .../hbase/procedure2/store/ProcedureStoreBase.java |    9 +-
 .../hbase/procedure2/store/ProcedureTree.java      |    6 +-
 .../hbase/procedure2/store/ProtoAndProcedure.java  |    4 +-
 .../hbase/procedure2/store/wal/BitSetNode.java     |    4 +-
 .../wal/CorruptedWALProcedureStoreException.java   |    2 +-
 .../store/wal/ProcedureStoreTracker.java           |   64 +-
 .../procedure2/store/wal/ProcedureWALFile.java     |   10 +-
 .../procedure2/store/wal/ProcedureWALFormat.java   |   73 +-
 .../store/wal/ProcedureWALFormatReader.java        |   13 +-
 .../store/wal/ProcedureWALPrettyPrinter.java       |   31 +-
 .../procedure2/store/wal/WALProcedureMap.java      |    4 +-
 .../procedure2/store/wal/WALProcedureStore.java    |  130 +-
 .../hadoop/hbase/procedure2/util/ByteSlot.java     |   13 +-
 .../hadoop/hbase/procedure2/util/DelayedUtil.java  |   12 +-
 .../hadoop/hbase/procedure2/util/StringUtils.java  |   17 +-
 .../hbase/procedure2/ProcedureTestingUtility.java  |    7 +-
 .../hbase/procedure2/TestChildProcedures.java      |   18 +-
 .../hbase/procedure2/TestForceUpdateProcedure.java |    8 +-
 .../hadoop/hbase/procedure2/TestLockAndQueue.java  |    2 +-
 .../hbase/procedure2/TestProcedureBypass.java      |   64 +-
 .../hbase/procedure2/TestProcedureCleanup.java     |    9 +-
 .../hbase/procedure2/TestProcedureEvents.java      |   53 +-
 .../hbase/procedure2/TestProcedureExecution.java   |    9 +-
 .../hbase/procedure2/TestProcedureExecutor.java    |   13 +-
 .../procedure2/TestProcedureInMemoryChore.java     |    6 +-
 .../hbase/procedure2/TestProcedureMetrics.java     |   12 +-
 .../hbase/procedure2/TestProcedureNonce.java       |   19 +-
 .../hbase/procedure2/TestProcedureRecovery.java    |   48 +-
 .../hbase/procedure2/TestProcedureReplayOrder.java |   26 +-
 .../procedure2/TestProcedureRollbackAIOOB.java     |    8 +-
 .../TestProcedureSchedulerConcurrency.java         |   14 +-
 .../procedure2/TestProcedureSkipPersistence.java   |    4 +-
 .../hbase/procedure2/TestProcedureSuspended.java   |   18 +-
 .../hbase/procedure2/TestProcedureToString.java    |   31 +-
 .../hadoop/hbase/procedure2/TestProcedureUtil.java |    7 +-
 ...rocedureDispatcherUncaughtExceptionHandler.java |    2 +-
 .../procedure2/TestStateMachineProcedure.java      |   26 +-
 .../hbase/procedure2/TestYieldProcedures.java      |   30 +-
 .../store/ProcedureStorePerformanceEvaluation.java |   37 +-
 .../hbase/procedure2/store/TestProcedureTree.java  |    4 +-
 .../ProcedureWALLoaderPerformanceEvaluation.java   |   61 +-
 .../wal/ProcedureWALPerformanceEvaluation.java     |    6 +-
 .../hbase/procedure2/store/wal/TestBitSetNode.java |    2 +-
 .../store/wal/TestProcedureStoreTracker.java       |    7 +-
 .../store/wal/TestStressWALProcedureStore.java     |   13 +-
 .../store/wal/TestWALProcedureStore.java           |  128 +-
 .../hbase/procedure2/util/TestDelayedUtil.java     |   17 +-
 hbase-protocol-shaded/pom.xml                      |   98 +-
 .../hadoop/hbase/util/ForeignExceptionUtil.java    |   26 +-
 hbase-protocol/pom.xml                             |   72 +-
 .../google/protobuf/HBaseZeroCopyByteString.java   |   22 +-
 .../org/apache/hadoop/hbase/util/ByteStringer.java |   18 +-
 hbase-replication/pom.xml                          |   57 +-
 .../hbase/replication/ReplicationFactory.java      |    2 +-
 .../hbase/replication/ReplicationListener.java     |    1 -
 .../hadoop/hbase/replication/ReplicationPeer.java  |    7 +-
 .../replication/ReplicationPeerConfigListener.java |    6 +-
 .../hbase/replication/ReplicationPeerImpl.java     |    6 +-
 .../hbase/replication/ReplicationPeerStorage.java  |    7 +-
 .../hadoop/hbase/replication/ReplicationPeers.java |    7 +-
 .../hbase/replication/ReplicationQueueInfo.java    |   59 +-
 .../hbase/replication/ReplicationQueueStorage.java |   51 +-
 .../replication/ReplicationStorageFactory.java     |    4 +-
 .../hadoop/hbase/replication/ReplicationUtils.java |   24 +-
 .../replication/ZKReplicationPeerStorage.java      |   19 +-
 .../replication/ZKReplicationQueueStorage.java     |  133 +-
 .../replication/ZKReplicationStorageBase.java      |    5 +-
 .../replication/TestReplicationStateBasic.java     |   24 +-
 .../replication/TestReplicationStateZKImpl.java    |   10 +-
 .../replication/TestZKReplicationPeerStorage.java  |   73 +-
 .../replication/TestZKReplicationQueueStorage.java |    6 +-
 hbase-resource-bundle/pom.xml                      |   16 +-
 hbase-rest/pom.xml                                 |  250 +-
 .../org/apache/hadoop/hbase/rest/Constants.java    |   13 +-
 .../apache/hadoop/hbase/rest/ExistsResource.java   |   20 +-
 .../org/apache/hadoop/hbase/rest/MetricsREST.java  |   18 +-
 .../apache/hadoop/hbase/rest/MultiRowResource.java |   27 +-
 .../hbase/rest/NamespacesInstanceResource.java     |  108 +-
 .../hadoop/hbase/rest/NamespacesResource.java      |   11 +-
 .../hadoop/hbase/rest/ProtobufMessageHandler.java  |   14 +-
 .../hadoop/hbase/rest/ProtobufStreamingOutput.java |   18 +-
 .../org/apache/hadoop/hbase/rest/RESTServer.java   |  117 +-
 .../org/apache/hadoop/hbase/rest/RESTServlet.java  |   40 +-
 .../hadoop/hbase/rest/RESTServletContainer.java    |   24 +-
 .../apache/hadoop/hbase/rest/RegionsResource.java  |   20 +-
 .../org/apache/hadoop/hbase/rest/ResourceBase.java |   51 +-
 .../apache/hadoop/hbase/rest/ResultGenerator.java  |    8 +-
 .../org/apache/hadoop/hbase/rest/RootResource.java |   17 +-
 .../org/apache/hadoop/hbase/rest/RowResource.java  |  363 +--
 .../hadoop/hbase/rest/RowResultGenerator.java      |   10 +-
 .../java/org/apache/hadoop/hbase/rest/RowSpec.java |  109 +-
 .../hadoop/hbase/rest/ScannerInstanceResource.java |   56 +-
 .../apache/hadoop/hbase/rest/ScannerResource.java  |   66 +-
 .../hadoop/hbase/rest/ScannerResultGenerator.java  |   29 +-
 .../apache/hadoop/hbase/rest/SchemaResource.java   |   75 +-
 .../hbase/rest/StorageClusterStatusResource.java   |   40 +-
 .../hbase/rest/StorageClusterVersionResource.java  |   18 +-
 .../apache/hadoop/hbase/rest/TableResource.java    |   71 +-
 .../hadoop/hbase/rest/TableScanResource.java       |   17 +-
 .../apache/hadoop/hbase/rest/VersionResource.java  |   15 +-
 .../apache/hadoop/hbase/rest/client/Client.java    |  342 ++-
 .../apache/hadoop/hbase/rest/client/Cluster.java   |   21 +-
 .../apache/hadoop/hbase/rest/client/Response.java  |   24 +-
 .../hadoop/hbase/rest/filter/AuthFilter.java       |   29 +-
 .../hbase/rest/filter/GZIPRequestStream.java       |    3 -
 .../hbase/rest/filter/GZIPRequestWrapper.java      |    4 -
 .../hbase/rest/filter/GZIPResponseStream.java      |    3 -
 .../hbase/rest/filter/GZIPResponseWrapper.java     |   12 +-
 .../hadoop/hbase/rest/filter/GzipFilter.java       |   24 +-
 .../rest/filter/RestCsrfPreventionFilter.java      |  139 +-
 .../apache/hadoop/hbase/rest/model/CellModel.java  |   77 +-
 .../hadoop/hbase/rest/model/CellSetModel.java      |   18 +-
 .../hadoop/hbase/rest/model/ColumnSchemaModel.java |   48 +-
 .../hbase/rest/model/NamespacesInstanceModel.java  |   51 +-
 .../hadoop/hbase/rest/model/NamespacesModel.java   |   23 +-
 .../apache/hadoop/hbase/rest/model/RowModel.java   |   56 +-
 .../hadoop/hbase/rest/model/ScannerModel.java      |  430 +--
 .../rest/model/StorageClusterStatusModel.java      |  110 +-
 .../rest/model/StorageClusterVersionModel.java     |   18 +-
 .../hadoop/hbase/rest/model/TableInfoModel.java    |   37 +-
 .../hadoop/hbase/rest/model/TableListModel.java    |   25 +-
 .../apache/hadoop/hbase/rest/model/TableModel.java |   21 +-
 .../hadoop/hbase/rest/model/TableRegionModel.java  |   55 +-
 .../hadoop/hbase/rest/model/TableSchemaModel.java  |   54 +-
 .../hadoop/hbase/rest/model/VersionModel.java      |   39 +-
 .../hbase/rest/provider/JAXBContextResolver.java   |   31 +-
 .../consumer/ProtobufMessageBodyConsumer.java      |   28 +-
 .../producer/PlainTextMessageBodyProducer.java     |   24 +-
 .../producer/ProtobufMessageBodyProducer.java      |   25 +-
 .../org/apache/hadoop/hbase/rest/DummyFilter.java  |   10 +-
 .../hadoop/hbase/rest/HBaseRESTTestingUtility.java |    7 +-
 .../hadoop/hbase/rest/PerformanceEvaluation.java   |  330 ++-
 .../apache/hadoop/hbase/rest/RowResourceBase.java  |  284 +-
 .../apache/hadoop/hbase/rest/TestDeleteRow.java    |   10 +-
 .../hadoop/hbase/rest/TestGZIPResponseWrapper.java |    6 +-
 .../hadoop/hbase/rest/TestGetAndPutResource.java   |  191 +-
 .../apache/hadoop/hbase/rest/TestGzipFilter.java   |   13 +-
 .../hadoop/hbase/rest/TestMultiRowResource.java    |   15 +-
 .../hbase/rest/TestNamespacesInstanceResource.java |   71 +-
 .../hadoop/hbase/rest/TestNamespacesResource.java  |    9 +-
 .../hadoop/hbase/rest/TestRESTServerSSL.java       |   15 +-
 .../hadoop/hbase/rest/TestResourceFilter.java      |   12 +-
 .../hadoop/hbase/rest/TestScannerResource.java     |   66 +-
 .../hadoop/hbase/rest/TestScannersWithFilters.java |  273 +-
 .../hadoop/hbase/rest/TestScannersWithLabels.java  |   25 +-
 .../hadoop/hbase/rest/TestSchemaResource.java      |   39 +-
 .../hadoop/hbase/rest/TestSecureRESTServer.java    |  121 +-
 .../hbase/rest/TestSecurityHeadersFilter.java      |   50 +-
 .../hadoop/hbase/rest/TestStatusResource.java      |   18 +-
 .../hadoop/hbase/rest/TestTableResource.java       |   43 +-
 .../apache/hadoop/hbase/rest/TestTableScan.java    |  154 +-
 .../hadoop/hbase/rest/TestVersionResource.java     |   46 +-
 .../hadoop/hbase/rest/client/RemoteAdmin.java      |  279 +-
 .../hadoop/hbase/rest/client/RemoteHTable.java     |  389 ++-
 .../hbase/rest/client/TestRemoteAdminRetries.java  |   10 +-
 .../hbase/rest/client/TestRemoteHTableRetries.java |   25 +-
 .../hadoop/hbase/rest/client/TestRemoteTable.java  |   53 +-
 .../hadoop/hbase/rest/client/TestXmlParsing.java   |   19 +-
 .../hadoop/hbase/rest/model/TestCellModel.java     |   15 +-
 .../hadoop/hbase/rest/model/TestCellSetModel.java  |   66 +-
 .../hbase/rest/model/TestColumnSchemaModel.java    |   21 +-
 .../hadoop/hbase/rest/model/TestModelBase.java     |   28 +-
 .../rest/model/TestNamespacesInstanceModel.java    |   39 +-
 .../hbase/rest/model/TestNamespacesModel.java      |   15 +-
 .../hadoop/hbase/rest/model/TestRowModel.java      |   14 +-
 .../hadoop/hbase/rest/model/TestScannerModel.java  |   27 +-
 .../rest/model/TestStorageClusterStatusModel.java  |  103 +-
 .../rest/model/TestStorageClusterVersionModel.java |   14 +-
 .../hbase/rest/model/TestTableInfoModel.java       |   32 +-
 .../hbase/rest/model/TestTableListModel.java       |   15 +-
 .../hbase/rest/model/TestTableRegionModel.java     |   35 +-
 .../hbase/rest/model/TestTableSchemaModel.java     |   40 +-
 .../hadoop/hbase/rest/model/TestVersionModel.java  |   32 +-
 hbase-rest/src/test/resources/mapred-site.xml      |    1 -
 hbase-rsgroup/pom.xml                              |   87 +-
 .../apache/hadoop/hbase/rsgroup/RSGroupAdmin.java  |   36 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminClient.java   |   94 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java |  187 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminServer.java   |  222 +-
 .../hbase/rsgroup/RSGroupBasedLoadBalancer.java    |  103 +-
 .../hadoop/hbase/rsgroup/RSGroupInfoManager.java   |   34 +-
 .../hbase/rsgroup/RSGroupInfoManagerImpl.java      |   88 +-
 .../hbase/rsgroup/RSGroupMajorCompactionTTL.java   |   29 +-
 .../hadoop/hbase/rsgroup/RSGroupProtobufUtil.java  |   58 +-
 .../apache/hadoop/hbase/rsgroup/RSGroupUtil.java   |    3 +-
 .../hadoop/hbase/rsgroup/RSGroupableBalancer.java  |    7 +-
 .../balancer/RSGroupableBalancerTestBase.java      |  153 +-
 .../balancer/TestRSGroupBasedLoadBalancer.java     |   58 +-
 ...lancerWithStochasticLoadBalancerAsInternal.java |   22 +-
 .../procedure/TestSCPWithReplicasWithRSGroup.java  |    6 +-
 .../rsgroup/TestDetermineRSGroupInfoForTable.java  |   26 +-
 .../hadoop/hbase/rsgroup/TestEnableRSGroups.java   |   10 +-
 .../hadoop/hbase/rsgroup/TestRSGroupConfig.java    |    7 +-
 .../rsgroup/TestRSGroupMajorCompactionTTL.java     |   22 +-
 .../hbase/rsgroup/TestRSGroupMappingScript.java    |   30 +-
 .../hadoop/hbase/rsgroup/TestRSGroupUtil.java      |   19 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java   |   48 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java   |   76 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsBalance.java  |    9 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsBase.java     |  120 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsBasics.java   |   13 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsFallback.java |   19 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsKillRS.java   |   51 +-
 .../hbase/rsgroup/TestRSGroupsOfflineMode.java     |   27 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsWithACL.java  |  111 +-
 .../rsgroup/TestTableDescriptorWithRSGroup.java    |   35 +-
 .../rsgroup/TestUpdateRSGroupConfiguration.java    |   23 +-
 .../hbase/rsgroup/VerifyingRSGroupAdminClient.java |   35 +-
 hbase-server/pom.xml                               |  486 ++--
 .../hadoop/hbase/CoordinatedStateManager.java      |   15 +-
 .../apache/hadoop/hbase/DaemonThreadFactory.java   |    2 +-
 .../hadoop/hbase/HDFSBlocksDistribution.java       |   58 +-
 .../org/apache/hadoop/hbase/HealthCheckChore.java  |   11 +-
 .../org/apache/hadoop/hbase/HealthChecker.java     |   49 +-
 .../java/org/apache/hadoop/hbase/HealthReport.java |   10 +-
 .../java/org/apache/hadoop/hbase/JMXListener.java  |   60 +-
 .../org/apache/hadoop/hbase/LocalHBaseCluster.java |  240 +-
 .../hadoop/hbase/MetaRegionLocationCache.java      |   34 +-
 .../apache/hadoop/hbase/RegionStateListener.java   |   15 +-
 .../main/java/org/apache/hadoop/hbase/Server.java  |   20 +-
 .../org/apache/hadoop/hbase/SplitLogCounters.java  |   30 +-
 .../java/org/apache/hadoop/hbase/SplitLogTask.java |   34 +-
 .../hbase/SslRMIClientSocketFactorySecure.java     |   28 +-
 .../hbase/SslRMIServerSocketFactorySecure.java     |   30 +-
 .../org/apache/hadoop/hbase/TableDescriptors.java  |   11 +-
 .../apache/hadoop/hbase/YouAreDeadException.java   |    4 +-
 .../apache/hadoop/hbase/ZKNamespaceManager.java    |   52 +-
 .../java/org/apache/hadoop/hbase/ZNodeClearer.java |   69 +-
 .../hbase/backup/FailedArchiveException.java       |   11 +-
 .../apache/hadoop/hbase/backup/HFileArchiver.java  |  272 +-
 .../hbase/backup/example/HFileArchiveManager.java  |   17 +-
 .../backup/example/HFileArchiveTableMonitor.java   |    8 +-
 .../example/LongTermArchivingHFileCleaner.java     |   15 +-
 .../backup/example/TableHFileArchiveTracker.java   |   20 +-
 .../hbase/backup/example/ZKTableArchiveClient.java |   26 +-
 .../hbase/client/ClientSideRegionScanner.java      |   16 +-
 .../hadoop/hbase/client/RegionServerRegistry.java  |    2 +-
 .../hadoop/hbase/client/ServerConnectionUtils.java |   49 +-
 .../hadoop/hbase/client/TableSnapshotScanner.java  |   68 +-
 .../hadoop/hbase/client/VersionInfoUtil.java       |   42 +-
 .../client/coprocessor/RowProcessorClient.java     |   21 +-
 .../hadoop/hbase/client/locking/EntityLock.java    |  100 +-
 .../hbase/client/locking/LockServiceClient.java    |   51 +-
 .../apache/hadoop/hbase/codec/MessageCodec.java    |   32 +-
 .../hadoop/hbase/constraint/BaseConstraint.java    |    8 +-
 .../apache/hadoop/hbase/constraint/Constraint.java |   60 +-
 .../hbase/constraint/ConstraintException.java      |   19 +-
 .../hbase/constraint/ConstraintProcessor.java      |   18 +-
 .../hadoop/hbase/constraint/Constraints.java       |  382 +--
 .../coordination/SplitLogManagerCoordination.java  |   16 +-
 .../coordination/SplitLogWorkerCoordination.java   |   63 +-
 .../ZKSplitLogManagerCoordination.java             |  104 +-
 .../coordination/ZkCoordinatedStateManager.java    |    9 +-
 .../coordination/ZkSplitLogWorkerCoordination.java |   98 +-
 .../hadoop/hbase/coprocessor/BaseEnvironment.java  |   25 +-
 .../coprocessor/BaseRowProcessorEndpoint.java      |   67 +-
 .../hadoop/hbase/coprocessor/BulkLoadObserver.java |   73 +-
 .../hadoop/hbase/coprocessor/CoprocessorHost.java  |  278 +-
 .../hbase/coprocessor/CoprocessorService.java      |    9 +-
 .../CoprocessorServiceBackwardCompatiblity.java    |   26 +-
 .../hadoop/hbase/coprocessor/CoreCoprocessor.java  |   16 +-
 .../hadoop/hbase/coprocessor/EndpointObserver.java |   83 +-
 .../hbase/coprocessor/HasMasterServices.java       |    6 +-
 .../hbase/coprocessor/HasRegionServerServices.java |    6 +-
 .../hbase/coprocessor/MasterCoprocessor.java       |   14 +-
 .../coprocessor/MasterCoprocessorEnvironment.java  |   66 +-
 .../hadoop/hbase/coprocessor/MasterObserver.java   | 1386 +++++-----
 .../hadoop/hbase/coprocessor/MetaTableMetrics.java |   37 +-
 .../hbase/coprocessor/MetricsCoprocessor.java      |   78 +-
 .../coprocessor/MultiRowMutationEndpoint.java      |   46 +-
 .../hadoop/hbase/coprocessor/ObserverContext.java  |   57 +-
 .../hbase/coprocessor/ObserverContextImpl.java     |    2 +-
 .../hbase/coprocessor/ReadOnlyConfiguration.java   |    8 +-
 .../hbase/coprocessor/RegionCoprocessor.java       |   14 +-
 .../coprocessor/RegionCoprocessorEnvironment.java  |   21 +-
 .../hadoop/hbase/coprocessor/RegionObserver.java   | 1153 ++++----
 .../hbase/coprocessor/RegionServerCoprocessor.java |   14 +-
 .../RegionServerCoprocessorEnvironment.java        |   65 +-
 .../hbase/coprocessor/RegionServerObserver.java    |   84 +-
 .../coprocessor/SingletonCoprocessorService.java   |    5 +-
 .../hadoop/hbase/coprocessor/WALCoprocessor.java   |   14 +-
 .../coprocessor/WALCoprocessorEnvironment.java     |   15 +-
 .../hadoop/hbase/coprocessor/WALObserver.java      |   92 +-
 .../hbase/errorhandling/ForeignException.java      |   68 +-
 .../errorhandling/ForeignExceptionDispatcher.java  |   31 +-
 .../errorhandling/ForeignExceptionListener.java    |    2 +-
 .../hbase/errorhandling/ForeignExceptionSnare.java |   36 +-
 .../hbase/errorhandling/TimeoutException.java      |   14 +-
 .../errorhandling/TimeoutExceptionInjector.java    |   19 +-
 .../apache/hadoop/hbase/executor/EventHandler.java |   71 +-
 .../apache/hadoop/hbase/executor/EventType.java    |  129 +-
 .../hadoop/hbase/executor/ExecutorService.java     |  122 +-
 .../apache/hadoop/hbase/executor/ExecutorType.java |   46 +-
 .../hbase/favored/FavoredNodeAssignmentHelper.java |  226 +-
 .../hbase/favored/FavoredNodeLoadBalancer.java     |  167 +-
 .../hadoop/hbase/favored/FavoredNodesManager.java  |   74 +-
 .../hadoop/hbase/favored/FavoredNodesPlan.java     |   35 +-
 .../hadoop/hbase/favored/FavoredNodesPromoter.java |   13 +-
 .../hbase/favored/StartcodeAgnosticServerName.java |   24 +-
 .../apache/hadoop/hbase/filter/FilterWrapper.java  |   48 +-
 .../org/apache/hadoop/hbase/fs/HFileSystem.java    |  186 +-
 .../hadoop/hbase/io/FSDataInputStreamWrapper.java  |  101 +-
 .../java/org/apache/hadoop/hbase/io/FileLink.java  |  137 +-
 .../java/org/apache/hadoop/hbase/io/HFileLink.java |  296 +--
 .../hadoop/hbase/io/HalfStoreFileReader.java       |   67 +-
 .../java/org/apache/hadoop/hbase/io/MetricsIO.java |    5 +-
 .../hadoop/hbase/io/MetricsIOWrapperImpl.java      |    3 +-
 .../java/org/apache/hadoop/hbase/io/Reference.java |  113 +-
 .../java/org/apache/hadoop/hbase/io/WALLink.java   |   28 +-
 .../apache/hadoop/hbase/io/WritableWithSize.java   |    9 +-
 .../apache/hadoop/hbase/io/hfile/AgeSnapshot.java  |    9 +-
 .../apache/hadoop/hbase/io/hfile/BlockCache.java   |   36 +-
 .../hadoop/hbase/io/hfile/BlockCacheFactory.java   |   67 +-
 .../hadoop/hbase/io/hfile/BlockCacheKey.java       |   18 +-
 .../hadoop/hbase/io/hfile/BlockCacheUtil.java      |  102 +-
 .../hadoop/hbase/io/hfile/BlockCachesIterator.java |    9 +-
 .../hadoop/hbase/io/hfile/BlockWithScanInfo.java   |    8 +-
 .../apache/hadoop/hbase/io/hfile/CacheConfig.java  |  141 +-
 .../apache/hadoop/hbase/io/hfile/CacheStats.java   |   55 +-
 .../apache/hadoop/hbase/io/hfile/Cacheable.java    |   24 +-
 .../hbase/io/hfile/CacheableDeserializer.java      |    8 +-
 .../io/hfile/CacheableDeserializerIdManager.java   |   56 +-
 .../apache/hadoop/hbase/io/hfile/CachedBlock.java  |    7 +-
 .../apache/hadoop/hbase/io/hfile/ChecksumUtil.java |  100 +-
 .../hadoop/hbase/io/hfile/CombinedBlockCache.java  |  119 +-
 .../hadoop/hbase/io/hfile/CompoundBloomFilter.java |   50 +-
 .../hbase/io/hfile/CompoundBloomFilterBase.java    |   15 +-
 .../hbase/io/hfile/CompoundBloomFilterWriter.java  |   97 +-
 .../hbase/io/hfile/CorruptHFileException.java      |    4 +-
 .../hbase/io/hfile/ExclusiveMemHFileBlock.java     |   10 +-
 .../hbase/io/hfile/FirstLevelBlockCache.java       |    4 +-
 .../hadoop/hbase/io/hfile/FixedFileTrailer.java    |  189 +-
 .../org/apache/hadoop/hbase/io/hfile/HFile.java    |  339 ++-
 .../apache/hadoop/hbase/io/hfile/HFileBlock.java   |  928 +++----
 .../hadoop/hbase/io/hfile/HFileBlockBuilder.java   |   10 +-
 .../hadoop/hbase/io/hfile/HFileBlockIndex.java     |  797 +++---
 .../hbase/io/hfile/HFileDataBlockEncoder.java      |   81 +-
 .../hbase/io/hfile/HFileDataBlockEncoderImpl.java  |   45 +-
 .../apache/hadoop/hbase/io/hfile/HFileInfo.java    |  121 +-
 .../hadoop/hbase/io/hfile/HFilePreadReader.java    |   11 +-
 .../hadoop/hbase/io/hfile/HFilePrettyPrinter.java  |  194 +-
 .../hadoop/hbase/io/hfile/HFileReaderImpl.java     |  447 ++--
 .../apache/hadoop/hbase/io/hfile/HFileScanner.java |  119 +-
 .../hadoop/hbase/io/hfile/HFileStreamReader.java   |    8 +-
 .../apache/hadoop/hbase/io/hfile/HFileUtil.java    |   15 +-
 .../hadoop/hbase/io/hfile/HFileWriterImpl.java     |  239 +-
 .../io/hfile/InclusiveCombinedBlockCache.java      |   37 +-
 .../hbase/io/hfile/IndexOnlyLruBlockCache.java     |    8 +-
 .../hadoop/hbase/io/hfile/InlineBlockWriter.java   |   36 +-
 .../hbase/io/hfile/InvalidHFileException.java      |    3 +-
 .../hbase/io/hfile/LruAdaptiveBlockCache.java      |  457 ++--
 .../hadoop/hbase/io/hfile/LruBlockCache.java       |  347 ++-
 .../hadoop/hbase/io/hfile/LruCachedBlock.java      |   37 +-
 .../hadoop/hbase/io/hfile/LruCachedBlockQueue.java |   45 +-
 .../hbase/io/hfile/NoOpDataBlockEncoder.java       |   51 +-
 .../hadoop/hbase/io/hfile/PrefetchExecutor.java    |   46 +-
 .../hadoop/hbase/io/hfile/ReaderContext.java       |    6 +-
 .../hbase/io/hfile/ReaderContextBuilder.java       |   15 +-
 .../hadoop/hbase/io/hfile/ResizableBlockCache.java |    3 +-
 .../hadoop/hbase/io/hfile/SharedMemHFileBlock.java |   10 +-
 .../hadoop/hbase/io/hfile/TinyLfuBlockCache.java   |  134 +-
 .../hbase/io/hfile/bucket/BucketAllocator.java     |  137 +-
 .../io/hfile/bucket/BucketAllocatorException.java  |   28 +-
 .../hadoop/hbase/io/hfile/bucket/BucketCache.java  |  384 ++-
 .../hbase/io/hfile/bucket/BucketCacheStats.java    |   37 +-
 .../hadoop/hbase/io/hfile/bucket/BucketEntry.java  |   14 +-
 .../hbase/io/hfile/bucket/BucketProtoUtils.java    |   64 +-
 .../hbase/io/hfile/bucket/ByteBufferIOEngine.java  |   47 +-
 .../hbase/io/hfile/bucket/CacheFullException.java  |   31 +-
 .../hbase/io/hfile/bucket/CachedEntryQueue.java    |   65 +-
 .../hfile/bucket/ExclusiveMemoryMmapIOEngine.java  |   26 +-
 .../hadoop/hbase/io/hfile/bucket/FileIOEngine.java |   87 +-
 .../hbase/io/hfile/bucket/FileMmapIOEngine.java    |   17 +-
 .../hadoop/hbase/io/hfile/bucket/IOEngine.java     |   45 +-
 .../hbase/io/hfile/bucket/PersistentIOEngine.java  |   20 +-
 .../io/hfile/bucket/SharedMemoryMmapIOEngine.java  |    3 +-
 .../hadoop/hbase/io/util/MemorySizeUtil.java       |  108 +-
 .../hbase/ipc/AdaptiveLifoCoDelCallQueue.java      |  134 +-
 .../hadoop/hbase/ipc/BalancedQueueRpcExecutor.java |   10 +-
 .../org/apache/hadoop/hbase/ipc/BufferChain.java   |   21 +-
 .../org/apache/hadoop/hbase/ipc/CallQueueInfo.java |    9 +-
 .../org/apache/hadoop/hbase/ipc/CallRunner.java    |   36 +-
 .../hbase/ipc/EmptyServiceNameException.java       |    5 +-
 .../ipc/FastPathBalancedQueueRpcExecutor.java      |   30 +-
 .../hbase/ipc/FastPathRWQueueRpcExecutor.java      |   23 +-
 .../hadoop/hbase/ipc/FastPathRpcHandler.java       |    7 +-
 .../apache/hadoop/hbase/ipc/FifoRpcScheduler.java  |   14 +-
 .../hadoop/hbase/ipc/HBaseRPCErrorHandler.java     |    6 +-
 .../hadoop/hbase/ipc/MasterFifoRpcScheduler.java   |    7 +-
 .../hadoop/hbase/ipc/MetaRWQueueRpcExecutor.java   |    9 +-
 .../hadoop/hbase/ipc/MetricsHBaseServer.java       |   33 +-
 .../hbase/ipc/MetricsHBaseServerWrapperImpl.java   |    4 +-
 .../hadoop/hbase/ipc/NettyRpcFrameDecoder.java     |   34 +-
 .../apache/hadoop/hbase/ipc/NettyRpcServer.java    |   61 +-
 .../hbase/ipc/NettyRpcServerPreambleHandler.java   |    9 +-
 .../hbase/ipc/NettyRpcServerRequestDecoder.java    |   12 +-
 .../hbase/ipc/NettyRpcServerResponseEncoder.java   |    8 +-
 .../apache/hadoop/hbase/ipc/NettyServerCall.java   |   13 +-
 .../hadoop/hbase/ipc/NettyServerRpcConnection.java |   21 +-
 .../hadoop/hbase/ipc/PluggableBlockingQueue.java   |   26 +-
 .../hbase/ipc/PluggableRpcQueueNotFound.java       |    6 +-
 .../apache/hadoop/hbase/ipc/PriorityFunction.java  |   27 +-
 .../org/apache/hadoop/hbase/ipc/QosPriority.java   |    2 +-
 .../org/apache/hadoop/hbase/ipc/QueueBalancer.java |    3 +-
 .../apache/hadoop/hbase/ipc/RPCTInfoGetter.java    |   14 +-
 .../hadoop/hbase/ipc/RWQueueRpcExecutor.java       |   57 +-
 .../hadoop/hbase/ipc/RandomQueueBalancer.java      |    7 +-
 .../java/org/apache/hadoop/hbase/ipc/RpcCall.java  |   33 +-
 .../apache/hadoop/hbase/ipc/RpcCallContext.java    |   40 +-
 .../org/apache/hadoop/hbase/ipc/RpcCallback.java   |    4 +-
 .../org/apache/hadoop/hbase/ipc/RpcExecutor.java   |  120 +-
 .../org/apache/hadoop/hbase/ipc/RpcHandler.java    |   15 +-
 .../org/apache/hadoop/hbase/ipc/RpcResponse.java   |    2 +-
 .../org/apache/hadoop/hbase/ipc/RpcScheduler.java  |   22 +-
 .../hadoop/hbase/ipc/RpcSchedulerContext.java      |    5 +-
 .../org/apache/hadoop/hbase/ipc/RpcServer.java     |  255 +-
 .../apache/hadoop/hbase/ipc/RpcServerFactory.java  |   29 +-
 .../hadoop/hbase/ipc/RpcServerInterface.java       |   28 +-
 .../org/apache/hadoop/hbase/ipc/ServerCall.java    |  100 +-
 .../hadoop/hbase/ipc/ServerRpcConnection.java      |  216 +-
 .../hadoop/hbase/ipc/SimpleRpcScheduler.java       |  117 +-
 .../apache/hadoop/hbase/ipc/SimpleRpcServer.java   |  210 +-
 .../hadoop/hbase/ipc/SimpleRpcServerResponder.java |   26 +-
 .../apache/hadoop/hbase/ipc/SimpleServerCall.java  |   16 +-
 .../hbase/ipc/SimpleServerRpcConnection.java       |   36 +-
 .../hadoop/hbase/ipc/UnknownServiceException.java  |    2 +-
 .../hbase/mapreduce/LoadIncrementalHFiles.java     |    8 +-
 .../hadoop/hbase/master/ActiveMasterManager.java   |  125 +-
 .../hbase/master/AssignmentVerificationReport.java |  227 +-
 .../hadoop/hbase/master/CachedClusterId.java       |   24 +-
 .../apache/hadoop/hbase/master/ClusterSchema.java  |   45 +-
 .../hadoop/hbase/master/ClusterSchemaService.java  |    6 +-
 .../hbase/master/ClusterSchemaServiceImpl.java     |   31 +-
 .../hbase/master/ClusterStatusPublisher.java       |   74 +-
 .../org/apache/hadoop/hbase/master/DeadServer.java |   66 +-
 .../hadoop/hbase/master/DrainingServerTracker.java |   57 +-
 .../hbase/master/ExpiredMobFileCleanerChore.java   |   32 +-
 .../org/apache/hadoop/hbase/master/HMaster.java    | 1305 +++++----
 .../hadoop/hbase/master/HMasterCommandLine.java    |   83 +-
 .../org/apache/hadoop/hbase/master/HbckChore.java  |  101 +-
 .../apache/hadoop/hbase/master/LoadBalancer.java   |   64 +-
 .../MasterAnnotationReadingPriorityFunction.java   |   29 +-
 .../hadoop/hbase/master/MasterCoprocessorHost.java |  384 ++-
 .../hadoop/hbase/master/MasterFileSystem.java      |  123 +-
 .../hbase/master/MasterInitializationMonitor.java  |    6 +-
 .../hbase/master/MasterMobCompactionThread.java    |   42 +-
 .../hbase/master/MasterRegionServerList.java       |    2 +-
 .../hadoop/hbase/master/MasterRpcServices.java     | 1027 ++++----
 .../apache/hadoop/hbase/master/MasterServices.java |  250 +-
 .../hadoop/hbase/master/MasterWalManager.java      |   73 +-
 .../hbase/master/MetricsAssignmentManager.java     |   21 +-
 .../apache/hadoop/hbase/master/MetricsMaster.java  |   42 +-
 .../hbase/master/MetricsMasterFileSystem.java      |    3 +-
 .../hbase/master/MetricsMasterWrapperImpl.java     |   35 +-
 .../hadoop/hbase/master/MetricsSnapshot.java       |    3 +-
 .../hbase/master/MirroringTableStateManager.java   |    3 +-
 .../hadoop/hbase/master/MobCompactionChore.java    |   23 +-
 .../hbase/master/NoSuchProcedureException.java     |    2 +-
 .../apache/hadoop/hbase/master/RackManager.java    |   20 +-
 .../hbase/master/RegionPlacementMaintainer.java    |  408 ++-
 .../org/apache/hadoop/hbase/master/RegionPlan.java |   34 +-
 .../hadoop/hbase/master/RegionServerList.java      |    2 +-
 .../hadoop/hbase/master/RegionServerTracker.java   |   34 +-
 .../hadoop/hbase/master/RegionsRecoveryChore.java  |   44 +-
 .../hbase/master/RegionsRecoveryConfigManager.java |   15 +-
 .../apache/hadoop/hbase/master/ServerListener.java |   16 +-
 .../apache/hadoop/hbase/master/ServerManager.java  |  363 ++-
 .../master/SnapshotOfRegionAssignmentFromMeta.java |   23 +-
 .../hadoop/hbase/master/SnapshotSentinel.java      |   12 +-
 .../hadoop/hbase/master/SplitLogManager.java       |  166 +-
 .../hadoop/hbase/master/SplitOrMergeTracker.java   |   29 +-
 .../hadoop/hbase/master/SplitWALManager.java       |   58 +-
 .../hadoop/hbase/master/TableNamespaceManager.java |  108 +-
 .../hadoop/hbase/master/TableStateManager.java     |   28 +-
 .../apache/hadoop/hbase/master/WorkerAssigner.java |   16 +-
 .../hbase/master/assignment/AssignProcedure.java   |   18 +-
 .../hbase/master/assignment/AssignmentManager.java |  606 +++--
 .../master/assignment/AssignmentManagerUtil.java   |   77 +-
 .../master/assignment/CloseRegionProcedure.java    |   14 +-
 .../assignment/GCMergedRegionsProcedure.java       |   75 +-
 .../GCMultipleMergedRegionsProcedure.java          |   73 +-
 .../hbase/master/assignment/GCRegionProcedure.java |   24 +-
 .../assignment/MergeTableRegionsProcedure.java     |  193 +-
 .../master/assignment/MoveRegionProcedure.java     |   20 +-
 .../master/assignment/OpenRegionProcedure.java     |   25 +-
 .../assignment/RegionRemoteProcedureBase.java      |   33 +-
 .../hbase/master/assignment/RegionStateNode.java   |   10 +-
 .../hbase/master/assignment/RegionStateStore.java  |   56 +-
 .../hbase/master/assignment/RegionStates.java      |  121 +-
 .../assignment/RegionTransitionProcedure.java      |   25 +-
 .../hbase/master/assignment/ServerState.java       |   13 +-
 .../hbase/master/assignment/ServerStateNode.java   |    8 +-
 .../assignment/SplitTableRegionProcedure.java      |  215 +-
 .../assignment/TransitRegionStateProcedure.java    |   65 +-
 .../hbase/master/assignment/UnassignProcedure.java |   17 +-
 .../hbase/master/balancer/AssignRegionAction.java  |    2 +-
 .../hbase/master/balancer/BalanceAction.java       |    7 +-
 .../hbase/master/balancer/BalancerChore.java       |   10 +-
 .../master/balancer/BalancerClusterState.java      |   75 +-
 .../hbase/master/balancer/BalancerRegionLoad.java  |    7 +-
 .../hbase/master/balancer/BaseLoadBalancer.java    |  142 +-
 .../hbase/master/balancer/CandidateGenerator.java  |   30 +-
 .../hbase/master/balancer/ClusterLoadState.java    |    2 +-
 .../hbase/master/balancer/ClusterStatusChore.java  |   12 +-
 .../balancer/CostFromRegionLoadFunction.java       |    2 +-
 .../hadoop/hbase/master/balancer/CostFunction.java |   10 +-
 .../hbase/master/balancer/DoubleArrayCost.java     |   14 +-
 .../master/balancer/FavoredStochasticBalancer.java |  156 +-
 .../HeterogeneousRegionCountCostFunction.java      |   58 +-
 .../hbase/master/balancer/LoadBalancerFactory.java |    9 +-
 .../master/balancer/LoadCandidateGenerator.java    |   19 +-
 .../balancer/LocalityBasedCandidateGenerator.java  |   21 +-
 .../master/balancer/MaintenanceLoadBalancer.java   |    4 +-
 .../master/balancer/MemStoreSizeCostFunction.java  |    2 +-
 .../hbase/master/balancer/MetricsBalancer.java     |    7 +-
 .../master/balancer/MetricsStochasticBalancer.java |   11 +-
 .../hbase/master/balancer/MoveRegionAction.java    |    3 +-
 .../PrimaryRegionCountSkewCostFunction.java        |    2 +-
 .../master/balancer/RackLocalityCostFunction.java  |    2 +-
 .../master/balancer/RandomCandidateGenerator.java  |    2 +-
 .../master/balancer/ReadRequestCostFunction.java   |    2 +-
 .../master/balancer/RegionInfoComparator.java      |   11 +-
 .../master/balancer/RegionLocationFinder.java      |   87 +-
 .../balancer/RegionReplicaCandidateGenerator.java  |   20 +-
 .../RegionReplicaGroupingCostFunction.java         |   10 +-
 .../balancer/RegionReplicaHostCostFunction.java    |    3 +-
 .../hbase/master/balancer/ServerAndLoad.java       |    5 +-
 .../balancer/ServerLocalityCostFunction.java       |    2 +-
 .../hbase/master/balancer/SimpleLoadBalancer.java  |  261 +-
 .../master/balancer/StochasticLoadBalancer.java    |  291 +-
 .../master/balancer/StoreFileCostFunction.java     |    2 +-
 .../hbase/master/balancer/SwapRegionsAction.java   |    2 +-
 .../master/balancer/TableSkewCostFunction.java     |    1 +
 .../master/balancer/WriteRequestCostFunction.java  |    2 +-
 .../master/cleaner/BaseFileCleanerDelegate.java    |    8 +-
 .../master/cleaner/BaseHFileCleanerDelegate.java   |   11 +-
 .../master/cleaner/BaseLogCleanerDelegate.java     |   24 +-
 .../master/cleaner/BaseTimeToLiveFileCleaner.java  |    4 +-
 .../hadoop/hbase/master/cleaner/CleanerChore.java  |   70 +-
 .../hadoop/hbase/master/cleaner/DirScanPool.java   |    2 +-
 .../hbase/master/cleaner/FileCleanerDelegate.java  |   13 +-
 .../hadoop/hbase/master/cleaner/HFileCleaner.java  |   98 +-
 .../hbase/master/cleaner/HFileLinkCleaner.java     |   30 +-
 .../hadoop/hbase/master/cleaner/LogCleaner.java    |   41 +-
 .../master/cleaner/ReplicationBarrierCleaner.java  |   17 +-
 .../hbase/master/cleaner/SnapshotCleanerChore.java |   35 +-
 .../master/cleaner/TimeToLiveHFileCleaner.java     |    6 +-
 .../hbase/master/cleaner/TimeToLiveLogCleaner.java |    2 +-
 .../TimeToLiveMasterLocalStoreHFileCleaner.java    |    2 +-
 .../TimeToLiveMasterLocalStoreWALCleaner.java      |    2 +-
 .../cleaner/TimeToLiveProcedureWALCleaner.java     |    2 +-
 .../hbase/master/http/MasterDumpServlet.java       |   13 +-
 .../hbase/master/http/MasterRedirectServlet.java   |   25 +-
 .../hbase/master/http/MasterStatusServlet.java     |   36 +-
 .../hadoop/hbase/master/http/MetaBrowser.java      |   85 +-
 .../hbase/master/http/RegionReplicaInfo.java       |   47 +-
 .../hadoop/hbase/master/http/RegionVisualizer.java |   60 +-
 .../master/http/api_v1/ResourceConfigFactory.java  |   28 +-
 .../cluster_metrics/model/ClusterMetrics.java      |   15 +-
 .../resource/ClusterMetricsResource.java           |   18 +-
 .../hadoop/hbase/master/http/gson/GsonFactory.java |   10 +-
 .../master/http/gson/GsonSerializationFeature.java |    9 +-
 .../master/http/gson/SizeAsBytesSerializer.java    |    1 +
 .../hbase/master/http/jersey/MasterFeature.java    |    9 +-
 .../hbase/master/janitor/CatalogJanitor.java       |   46 +-
 .../hadoop/hbase/master/janitor/MetaFixer.java     |  132 +-
 .../apache/hadoop/hbase/master/janitor/Report.java |    6 +-
 .../hbase/master/janitor/ReportMakingVisitor.java  |    6 +-
 .../hadoop/hbase/master/locking/LockManager.java   |  107 +-
 .../hadoop/hbase/master/locking/LockProcedure.java |   76 +-
 .../hbase/master/migrate/RollingUpgradeChore.java  |   19 +-
 .../master/normalizer/MergeNormalizationPlan.java  |   21 +-
 .../hbase/master/normalizer/NormalizationPlan.java |    6 +-
 .../master/normalizer/NormalizationTarget.java     |   18 +-
 .../hbase/master/normalizer/RegionNormalizer.java  |   19 +-
 .../master/normalizer/RegionNormalizerFactory.java |    6 +-
 .../master/normalizer/RegionNormalizerManager.java |   24 +-
 .../normalizer/RegionNormalizerWorkQueue.java      |   42 +-
 .../master/normalizer/RegionNormalizerWorker.java  |   44 +-
 .../master/normalizer/SimpleRegionNormalizer.java  |  198 +-
 .../master/normalizer/SplitNormalizationPlan.java  |   15 +-
 .../AbstractStateMachineNamespaceProcedure.java    |   12 +-
 .../AbstractStateMachineRegionProcedure.java       |   18 +-
 .../AbstractStateMachineTableProcedure.java        |   31 +-
 .../master/procedure/CloneSnapshotProcedure.java   |  189 +-
 .../master/procedure/CreateNamespaceProcedure.java |  135 +-
 .../master/procedure/CreateTableProcedure.java     |  116 +-
 .../master/procedure/DeleteNamespaceProcedure.java |  152 +-
 .../master/procedure/DeleteTableProcedure.java     |   54 +-
 .../master/procedure/DisableTableProcedure.java    |   65 +-
 .../master/procedure/EnableTableProcedure.java     |   95 +-
 .../hadoop/hbase/master/procedure/FairQueue.java   |    2 +-
 .../master/procedure/HBCKServerCrashProcedure.java |   84 +-
 .../hbase/master/procedure/InitMetaProcedure.java  |    9 +-
 .../master/procedure/MasterDDLOperationHelper.java |   16 +-
 .../master/procedure/MasterProcedureConstants.java |   16 +-
 .../hbase/master/procedure/MasterProcedureEnv.java |    5 +-
 .../master/procedure/MasterProcedureScheduler.java |  201 +-
 .../master/procedure/MasterProcedureUtil.java      |   42 +-
 .../master/procedure/MetaProcedureInterface.java   |    2 +-
 .../hadoop/hbase/master/procedure/MetaQueue.java   |    2 +-
 .../master/procedure/ModifyNamespaceProcedure.java |   89 +-
 .../procedure/ModifyTableDescriptorProcedure.java  |    4 +-
 .../master/procedure/ModifyTableProcedure.java     |  139 +-
 .../master/procedure/PeerProcedureInterface.java   |    9 +-
 .../hadoop/hbase/master/procedure/PeerQueue.java   |    4 +-
 .../hbase/master/procedure/ProcedureDescriber.java |   28 +-
 .../master/procedure/ProcedurePrepareLatch.java    |   26 +-
 .../hbase/master/procedure/ProcedureSyncWait.java  |   61 +-
 .../hadoop/hbase/master/procedure/Queue.java       |    7 +-
 .../master/procedure/RSProcedureDispatcher.java    |   85 +-
 .../master/procedure/RecoverMetaProcedure.java     |   14 +-
 .../procedure/ReopenTableRegionsProcedure.java     |   28 +-
 .../master/procedure/RestoreSnapshotProcedure.java |  166 +-
 .../hbase/master/procedure/SchemaLocking.java      |   18 +-
 .../master/procedure/ServerCrashException.java     |    8 +-
 .../master/procedure/ServerCrashProcedure.java     |  107 +-
 .../master/procedure/ServerProcedureInterface.java |   14 +-
 .../hadoop/hbase/master/procedure/ServerQueue.java |    2 +-
 .../master/procedure/ServerRemoteProcedure.java    |   92 +-
 .../hbase/master/procedure/SnapshotProcedure.java  |   78 +-
 .../master/procedure/SnapshotRegionProcedure.java  |   24 +-
 .../master/procedure/SnapshotVerifyProcedure.java  |   25 +-
 .../hbase/master/procedure/SplitWALProcedure.java  |   42 +-
 .../master/procedure/SplitWALRemoteProcedure.java  |   33 +-
 .../procedure/SwitchRpcThrottleProcedure.java      |   20 +-
 .../SwitchRpcThrottleRemoteProcedure.java          |   19 +-
 .../master/procedure/TableProcedureInterface.java  |   30 +-
 .../hadoop/hbase/master/procedure/TableQueue.java  |    4 +-
 .../master/procedure/TruncateTableProcedure.java   |   53 +-
 .../hadoop/hbase/master/region/MasterRegion.java   |   27 +-
 .../hbase/master/region/MasterRegionFactory.java   |    9 +-
 .../region/MasterRegionFlusherAndCompactor.java    |    2 +-
 .../hbase/master/region/MasterRegionParams.java    |    2 +-
 .../hbase/master/region/MasterRegionUtils.java     |    2 +-
 .../hbase/master/region/MasterRegionWALRoller.java |    6 +-
 .../region/RegionScannerAsResultScanner.java       |    4 +-
 .../hbase/master/region/UpdateMasterRegion.java    |    4 +-
 .../master/replication/AbstractPeerProcedure.java  |    4 +-
 .../hbase/master/replication/AddPeerProcedure.java |   11 +-
 .../ClaimReplicationQueueRemoteProcedure.java      |    2 +-
 .../ClaimReplicationQueuesProcedure.java           |    2 +-
 .../master/replication/DisablePeerProcedure.java   |    2 +-
 .../master/replication/EnablePeerProcedure.java    |    2 +-
 .../master/replication/ModifyPeerProcedure.java    |   41 +-
 .../master/replication/RefreshPeerProcedure.java   |   11 +-
 .../master/replication/RemovePeerProcedure.java    |    4 +-
 .../master/replication/ReplicationPeerManager.java |   79 +-
 .../replication/UpdatePeerConfigProcedure.java     |    8 +-
 .../hbase/master/slowlog/SlowLogMasterService.java |   21 +-
 .../snapshot/DisabledTableSnapshotHandler.java     |   22 +-
 .../snapshot/EnabledTableSnapshotHandler.java      |   32 +-
 .../master/snapshot/MasterSnapshotVerifier.java    |   70 +-
 .../hbase/master/snapshot/SnapshotFileCache.java   |   59 +-
 .../master/snapshot/SnapshotHFileCleaner.java      |   22 +-
 .../hbase/master/snapshot/SnapshotManager.java     |  486 ++--
 .../hbase/master/snapshot/TakeSnapshotHandler.java |   88 +-
 .../hbase/master/zksyncer/ClientZKSyncer.java      |    5 +-
 .../hbase/master/zksyncer/MasterAddressSyncer.java |    3 +-
 .../hbase/master/zksyncer/MetaLocationSyncer.java  |    3 +-
 .../org/apache/hadoop/hbase/mob/CachedMobFile.java |   26 +-
 .../hadoop/hbase/mob/DefaultMobStoreCompactor.java |  113 +-
 .../hadoop/hbase/mob/DefaultMobStoreFlusher.java   |  103 +-
 .../hadoop/hbase/mob/ExpiredMobFileCleaner.java    |   39 +-
 .../hbase/mob/ManualMobMaintHFileCleaner.java      |   16 +-
 .../java/org/apache/hadoop/hbase/mob/MobCell.java  |    5 +-
 .../org/apache/hadoop/hbase/mob/MobConstants.java  |   41 +-
 .../java/org/apache/hadoop/hbase/mob/MobFile.java  |   42 +-
 .../org/apache/hadoop/hbase/mob/MobFileCache.java  |   47 +-
 .../org/apache/hadoop/hbase/mob/MobFileName.java   |   59 +-
 .../apache/hadoop/hbase/mob/MobStoreEngine.java    |    3 +-
 .../java/org/apache/hadoop/hbase/mob/MobUtils.java |  514 ++--
 .../mob/compactions/MobCompactionRequest.java      |    3 +-
 .../hadoop/hbase/mob/compactions/MobCompactor.java |   19 +-
 .../PartitionedMobCompactionRequest.java           |   48 +-
 .../mob/compactions/PartitionedMobCompactor.java   |  226 +-
 .../monitoring/MemoryBoundedLogMessageBuffer.java  |   49 +-
 .../hbase/monitoring/MonitoredRPCHandler.java      |   18 +-
 .../hbase/monitoring/MonitoredRPCHandlerImpl.java  |   90 +-
 .../hadoop/hbase/monitoring/MonitoredTask.java     |   26 +-
 .../hadoop/hbase/monitoring/MonitoredTaskImpl.java |   19 +-
 .../hadoop/hbase/monitoring/StateDumpServlet.java  |   16 +-
 .../hadoop/hbase/monitoring/TaskMonitor.java       |  130 +-
 .../hadoop/hbase/monitoring/ThreadMonitoring.java  |   31 +-
 .../hbase/namequeues/BalancerDecisionDetails.java  |    6 +-
 .../hbase/namequeues/BalancerRejectionDetails.java |    6 +-
 .../namequeues/DisruptorExceptionHandler.java      |    2 -
 .../hadoop/hbase/namequeues/LogEventHandler.java   |   35 +-
 .../hadoop/hbase/namequeues/LogHandlerUtils.java   |   17 +-
 .../hadoop/hbase/namequeues/NamedQueuePayload.java |    9 +-
 .../hbase/namequeues/NamedQueueRecorder.java       |   34 +-
 .../hadoop/hbase/namequeues/NamedQueueService.java |   19 +-
 .../hbase/namequeues/RingBufferEnvelope.java       |   16 +-
 .../hadoop/hbase/namequeues/RpcLogDetails.java     |   20 +-
 .../hbase/namequeues/SlowLogPersistentService.java |   18 +-
 .../hbase/namequeues/SlowLogTableOpsChore.java     |   12 +-
 .../impl/BalancerDecisionQueueService.java         |   28 +-
 .../impl/BalancerRejectionQueueService.java        |   43 +-
 .../hbase/namequeues/impl/SlowLogQueueService.java |   64 +-
 .../namequeues/request/NamedQueueGetRequest.java   |   31 +-
 .../namequeues/response/NamedQueueGetResponse.java |   13 +-
 .../hadoop/hbase/namespace/NamespaceAuditor.java   |   46 +-
 .../hbase/namespace/NamespaceStateManager.java     |   87 +-
 .../namespace/NamespaceTableAndRegionInfo.java     |   21 +-
 .../hbase/procedure/MasterProcedureManager.java    |   84 +-
 .../procedure/MasterProcedureManagerHost.java      |   13 +-
 .../apache/hadoop/hbase/procedure/Procedure.java   |  171 +-
 .../hbase/procedure/ProcedureCoordinator.java      |  124 +-
 .../hbase/procedure/ProcedureCoordinatorRpcs.java  |   38 +-
 .../hadoop/hbase/procedure/ProcedureManager.java   |   10 +-
 .../hbase/procedure/ProcedureManagerHost.java      |   33 +-
 .../hadoop/hbase/procedure/ProcedureMember.java    |   98 +-
 .../hbase/procedure/ProcedureMemberRpcs.java       |   24 +-
 .../procedure/RegionServerProcedureManager.java    |   16 +-
 .../RegionServerProcedureManagerHost.java          |   19 +-
 .../hadoop/hbase/procedure/Subprocedure.java       |  144 +-
 .../hbase/procedure/SubprocedureFactory.java       |    8 +-
 .../hbase/procedure/ZKProcedureCoordinator.java    |   62 +-
 .../hbase/procedure/ZKProcedureMemberRpcs.java     |  104 +-
 .../hadoop/hbase/procedure/ZKProcedureUtil.java    |   85 +-
 .../procedure/flush/FlushTableSubprocedure.java    |   31 +-
 .../flush/MasterFlushTableProcedureManager.java    |   30 +-
 .../RegionServerFlushTableProcedureManager.java    |  112 +-
 .../hbase/procedure2/BaseRSProcedureCallable.java  |    2 +-
 .../hbase/procedure2/RSProcedureCallable.java      |    5 +-
 .../store/region/HFileProcedurePrettyPrinter.java  |   10 +-
 .../store/region/RegionProcedureStore.java         |   30 +-
 .../store/region/WALProcedurePrettyPrinter.java    |   12 +-
 .../hbase/protobuf/ReplicationProtbufUtil.java     |   79 +-
 .../hbase/quotas/ActivePolicyEnforcement.java      |   67 +-
 .../hbase/quotas/AverageIntervalRateLimiter.java   |   35 +-
 .../hadoop/hbase/quotas/DefaultOperationQuota.java |   22 +-
 .../hadoop/hbase/quotas/ExceedOperationQuota.java  |    8 +-
 .../hadoop/hbase/quotas/FileArchiverNotifier.java  |   29 +-
 .../hbase/quotas/FileArchiverNotifierFactory.java  |   17 +-
 .../quotas/FileArchiverNotifierFactoryImpl.java    |   29 +-
 .../hbase/quotas/FileArchiverNotifierImpl.java     |  144 +-
 .../hbase/quotas/FileSystemUtilizationChore.java   |   51 +-
 .../hbase/quotas/FixedIntervalRateLimiter.java     |   27 +-
 .../hadoop/hbase/quotas/GlobalQuotaSettings.java   |   22 +-
 .../hbase/quotas/GlobalQuotaSettingsImpl.java      |   68 +-
 .../hadoop/hbase/quotas/MasterQuotaManager.java    |  181 +-
 .../hadoop/hbase/quotas/MasterQuotasObserver.java  |   30 +-
 .../hbase/quotas/NamespaceQuotaSnapshotStore.java  |   33 +-
 .../hadoop/hbase/quotas/NoOpRegionSizeStore.java   |   30 +-
 .../hadoop/hbase/quotas/NoopOperationQuota.java    |   11 +-
 .../hadoop/hbase/quotas/NoopQuotaLimiter.java      |    9 +-
 .../apache/hadoop/hbase/quotas/OperationQuota.java |   43 +-
 .../org/apache/hadoop/hbase/quotas/QuotaCache.java |   77 +-
 .../apache/hadoop/hbase/quotas/QuotaLimiter.java   |   52 +-
 .../hadoop/hbase/quotas/QuotaLimiterFactory.java   |    6 +-
 .../hadoop/hbase/quotas/QuotaObserverChore.java    |  261 +-
 .../hadoop/hbase/quotas/QuotaSnapshotStore.java    |   39 +-
 .../org/apache/hadoop/hbase/quotas/QuotaState.java |   21 +-
 .../org/apache/hadoop/hbase/quotas/QuotaUtil.java  |  163 +-
 .../apache/hadoop/hbase/quotas/RateLimiter.java    |   89 +-
 .../hbase/quotas/RegionServerRpcQuotaManager.java  |   88 +-
 .../quotas/RegionServerSpaceQuotaManager.java      |   97 +-
 .../org/apache/hadoop/hbase/quotas/RegionSize.java |   20 +-
 .../apache/hadoop/hbase/quotas/RegionSizeImpl.java |   26 +-
 .../hbase/quotas/RegionSizeReportingChore.java     |   52 +-
 .../hadoop/hbase/quotas/RegionSizeStore.java       |   30 +-
 .../hbase/quotas/RegionSizeStoreFactory.java       |   18 +-
 .../hadoop/hbase/quotas/RegionSizeStoreImpl.java   |   31 +-
 .../hadoop/hbase/quotas/RpcThrottleStorage.java    |    1 -
 .../hbase/quotas/SnapshotQuotaObserverChore.java   |  110 +-
 .../hbase/quotas/SpaceLimitingException.java       |   17 +-
 .../hbase/quotas/SpaceQuotaRefresherChore.java     |   80 +-
 .../hbase/quotas/SpaceQuotaSnapshotNotifier.java   |   26 +-
 .../quotas/SpaceQuotaSnapshotNotifierFactory.java  |   31 +-
 .../quotas/SpaceViolationPolicyEnforcement.java    |   32 +-
 .../SpaceViolationPolicyEnforcementFactory.java    |   43 +-
 .../hbase/quotas/TableQuotaSnapshotStore.java      |   34 +-
 .../quotas/TableSpaceQuotaSnapshotNotifier.java    |   18 +-
 .../hadoop/hbase/quotas/TimeBasedLimiter.java      |   29 +-
 .../apache/hadoop/hbase/quotas/UserQuotaState.java |   51 +-
 .../AbstractViolationPolicyEnforcement.java        |   29 +-
 .../DefaultViolationPolicyEnforcement.java         |   33 +-
 .../DisableTableViolationPolicyEnforcement.java    |   22 +-
 .../MissingSnapshotViolationPolicyEnforcement.java |   29 +-
 .../NoInsertsViolationPolicyEnforcement.java       |   27 +-
 ...ritesCompactionsViolationPolicyEnforcement.java |   26 +-
 .../NoWritesViolationPolicyEnforcement.java        |   29 +-
 .../hbase/regionserver/AbstractMemStore.java       |  116 +-
 .../regionserver/AbstractMultiFileWriter.java      |   14 +-
 .../AdaptiveMemStoreCompactionStrategy.java        |   53 +-
 .../AnnotationReadingPriorityFunction.java         |  120 +-
 .../hbase/regionserver/BaseRowProcessor.java       |   12 +-
 .../BasicMemStoreCompactionStrategy.java           |   10 +-
 .../hbase/regionserver/BootstrapNodeManager.java   |    8 +-
 .../hbase/regionserver/BrokenStoreFileCleaner.java |   67 +-
 .../hbase/regionserver/BusyRegionSplitPolicy.java  |   46 +-
 .../regionserver/ByteBufferChunkKeyValue.java      |    7 +-
 .../hbase/regionserver/CSLMImmutableSegment.java   |   18 +-
 .../regionserver/CellArrayImmutableSegment.java    |   73 +-
 .../hadoop/hbase/regionserver/CellArrayMap.java    |   26 +-
 .../regionserver/CellChunkImmutableSegment.java    |  117 +-
 .../hadoop/hbase/regionserver/CellChunkMap.java    |   90 +-
 .../hadoop/hbase/regionserver/CellFlatMap.java     |  104 +-
 .../apache/hadoop/hbase/regionserver/CellSet.java  |   26 +-
 .../apache/hadoop/hbase/regionserver/CellSink.java |   11 +-
 .../hbase/regionserver/ChangedReadersObserver.java |    9 +-
 .../apache/hadoop/hbase/regionserver/Chunk.java    |   23 +-
 .../hadoop/hbase/regionserver/ChunkCreator.java    |  146 +-
 .../hadoop/hbase/regionserver/CompactSplit.java    |  207 +-
 .../CompactedHFilesDischargeHandler.java           |    6 +-
 .../regionserver/CompactedHFilesDischarger.java    |   40 +-
 .../hbase/regionserver/CompactingMemStore.java     |  196 +-
 .../hbase/regionserver/CompactionPipeline.java     |  132 +-
 .../regionserver/CompositeImmutableSegment.java    |   32 +-
 .../ConstantSizeRegionSplitPolicy.java             |   30 +-
 .../regionserver/CreateStoreFileWriterParams.java  |    2 +-
 .../regionserver/CustomizedScanInfoBuilder.java    |    8 +-
 .../regionserver/DateTieredMultiFileWriter.java    |    9 +-
 .../hbase/regionserver/DateTieredStoreEngine.java  |   27 +-
 .../hbase/regionserver/DefaultHeapMemoryTuner.java |  266 +-
 .../hadoop/hbase/regionserver/DefaultMemStore.java |   92 +-
 .../hbase/regionserver/DefaultStoreEngine.java     |   69 +-
 .../regionserver/DefaultStoreFileManager.java      |   33 +-
 .../hbase/regionserver/DefaultStoreFlusher.java    |   11 +-
 .../DelimitedKeyPrefixRegionSplitPolicy.java       |   46 +-
 .../DelimitedKeyPrefixRegionSplitRestriction.java  |   19 +-
 .../regionserver/DisabledRegionSplitPolicy.java    |    5 +-
 .../regionserver/DumpRegionServerMetrics.java      |   21 +-
 .../EagerMemStoreCompactionStrategy.java           |    5 +-
 .../hbase/regionserver/FavoredNodesForRegion.java  |   20 +-
 .../regionserver/FifoRpcSchedulerFactory.java      |    6 +-
 .../regionserver/FlushAllLargeStoresPolicy.java    |    3 +-
 .../hbase/regionserver/FlushAllStoresPolicy.java   |    1 -
 .../hbase/regionserver/FlushLargeStoresPolicy.java |   62 +-
 .../hbase/regionserver/FlushLifeCycleTracker.java  |    2 +-
 .../FlushNonSloppyStoresFirstPolicy.java           |    8 +-
 .../hadoop/hbase/regionserver/FlushPolicy.java     |    3 +-
 .../hbase/regionserver/FlushPolicyFactory.java     |   18 +-
 .../hbase/regionserver/FlushRequestListener.java   |    7 +-
 .../hadoop/hbase/regionserver/FlushRequester.java  |   29 +-
 .../hadoop/hbase/regionserver/FlushType.java       |   19 +-
 .../hadoop/hbase/regionserver/HMobStore.java       |  208 +-
 .../apache/hadoop/hbase/regionserver/HRegion.java  | 2773 +++++++++-----------
 .../hbase/regionserver/HRegionFileSystem.java      |  398 ++-
 .../hadoop/hbase/regionserver/HRegionServer.java   | 1082 ++++----
 .../regionserver/HRegionServerCommandLine.java     |   19 +-
 .../hbase/regionserver/HRegionWALFileSystem.java   |    2 +-
 .../apache/hadoop/hbase/regionserver/HStore.java   |  706 +++--
 .../hadoop/hbase/regionserver/HStoreFile.java      |  132 +-
 .../hbase/regionserver/HeapMemoryManager.java      |  168 +-
 .../hadoop/hbase/regionserver/HeapMemoryTuner.java |   13 +-
 .../hbase/regionserver/ImmutableMemStoreLAB.java   |   36 +-
 .../hbase/regionserver/ImmutableSegment.java       |   35 +-
 .../IncreasingToUpperBoundRegionSplitPolicy.java   |   44 +-
 .../regionserver/InputStreamBlockDistribution.java |   47 +-
 .../hadoop/hbase/regionserver/InternalScan.java    |   32 +-
 .../hadoop/hbase/regionserver/InternalScanner.java |   33 +-
 .../regionserver/KeyPrefixRegionSplitPolicy.java   |   39 +-
 .../KeyPrefixRegionSplitRestriction.java           |   18 +-
 .../hadoop/hbase/regionserver/KeyValueHeap.java    |  156 +-
 .../hadoop/hbase/regionserver/KeyValueScanner.java |  105 +-
 .../hadoop/hbase/regionserver/LastSequenceId.java  |    4 +-
 .../hadoop/hbase/regionserver/LeaseListener.java   |   14 +-
 .../hadoop/hbase/regionserver/LeaseManager.java    |   78 +-
 .../hadoop/hbase/regionserver/LogRoller.java       |   12 +-
 .../MasterFifoRpcSchedulerFactory.java             |    4 +-
 .../apache/hadoop/hbase/regionserver/MemStore.java |   64 +-
 .../regionserver/MemStoreCompactionStrategy.java   |   54 +-
 .../hbase/regionserver/MemStoreCompactor.java      |  137 +-
 .../MemStoreCompactorSegmentsIterator.java         |   22 +-
 .../hadoop/hbase/regionserver/MemStoreFlusher.java |  300 +--
 .../hadoop/hbase/regionserver/MemStoreLAB.java     |   43 +-
 .../hadoop/hbase/regionserver/MemStoreLABImpl.java |   62 +-
 .../MemStoreMergerSegmentsIterator.java            |   23 +-
 .../regionserver/MemStoreSegmentsIterator.java     |   16 +-
 .../hadoop/hbase/regionserver/MemStoreSize.java    |   27 +-
 .../hadoop/hbase/regionserver/MemStoreSizing.java  |   44 +-
 .../hbase/regionserver/MemStoreSnapshot.java       |    3 +-
 .../regionserver/MetricsHeapMemoryManager.java     |   28 +-
 .../hadoop/hbase/regionserver/MetricsRegion.java   |   37 +-
 .../hbase/regionserver/MetricsRegionServer.java    |   53 +-
 .../MetricsRegionServerWrapperImpl.java            |   99 +-
 .../regionserver/MetricsRegionWrapperImpl.java     |   27 +-
 .../hadoop/hbase/regionserver/MetricsTable.java    |   46 +-
 .../MetricsTableWrapperAggregateImpl.java          |   39 +-
 .../hbase/regionserver/MetricsUserAggregate.java   |    3 +-
 .../regionserver/MetricsUserAggregateFactory.java  |   35 +-
 .../regionserver/MetricsUserAggregateImpl.java     |   17 +-
 .../regionserver/MiniBatchOperationInProgress.java |   48 +-
 .../hbase/regionserver/MobReferenceOnlyFilter.java |    5 +-
 .../hadoop/hbase/regionserver/MobStoreScanner.java |   12 +-
 .../MultiVersionConcurrencyControl.java            |   70 +-
 .../hbase/regionserver/MutableOnlineRegions.java   |   12 +-
 .../hadoop/hbase/regionserver/MutableSegment.java  |   27 +-
 .../hbase/regionserver/NoLimitScannerContext.java  |    2 +-
 .../regionserver/NoTagByteBufferChunkKeyValue.java |    6 +-
 .../hbase/regionserver/NonLazyKeyValueScanner.java |   19 +-
 .../NonReversedNonLazyKeyValueScanner.java         |   50 +-
 .../regionserver/NonThreadSafeMemStoreSizing.java  |   10 +-
 .../hadoop/hbase/regionserver/OffheapChunk.java    |    3 +-
 .../hadoop/hbase/regionserver/OnheapChunk.java     |    3 +-
 .../hadoop/hbase/regionserver/OnlineRegions.java   |   36 +-
 .../hadoop/hbase/regionserver/OperationStatus.java |   22 +-
 .../hadoop/hbase/regionserver/RSRpcServices.java   |  967 ++++---
 .../hbase/regionserver/RSSnapshotVerifier.java     |   60 +-
 .../apache/hadoop/hbase/regionserver/Region.java   |  376 ++-
 .../hbase/regionserver/RegionCoprocessorHost.java  |  838 +++---
 .../hadoop/hbase/regionserver/RegionScanner.java   |   29 +-
 .../hbase/regionserver/RegionScannerImpl.java      |   44 +-
 .../hbase/regionserver/RegionServerAccounting.java |   22 +-
 .../regionserver/RegionServerCoprocessorHost.java  |   97 +-
 .../hbase/regionserver/RegionServerServices.java   |   35 +-
 .../regionserver/RegionServerTableMetrics.java     |   19 +-
 .../regionserver/RegionServicesForStores.java      |   22 +-
 .../hbase/regionserver/RegionSplitPolicy.java      |   93 +-
 .../hbase/regionserver/RegionSplitRestriction.java |   21 +-
 .../RemoteProcedureResultReporter.java             |    8 +-
 .../hbase/regionserver/ReplicationSinkService.java |   26 +-
 .../regionserver/ReplicationSourceService.java     |    7 +-
 .../hbase/regionserver/ReversedKeyValueHeap.java   |   92 +-
 .../regionserver/ReversedMobStoreScanner.java      |   12 +-
 .../regionserver/ReversedRegionScannerImpl.java    |   37 +-
 .../hbase/regionserver/ReversedStoreScanner.java   |   70 +-
 .../hadoop/hbase/regionserver/RowProcessor.java    |   88 +-
 .../hbase/regionserver/RowTooBigException.java     |   13 +-
 .../hbase/regionserver/RpcSchedulerFactory.java    |    8 +-
 .../apache/hadoop/hbase/regionserver/ScanInfo.java |   90 +-
 .../hadoop/hbase/regionserver/ScanOptions.java     |   11 +-
 .../apache/hadoop/hbase/regionserver/ScanType.java |    2 +-
 .../hadoop/hbase/regionserver/ScannerContext.java  |   71 +-
 .../hbase/regionserver/ScannerIdGenerator.java     |   21 +-
 .../hbase/regionserver/SecureBulkLoadManager.java  |  145 +-
 .../apache/hadoop/hbase/regionserver/Segment.java  |   70 +-
 .../hadoop/hbase/regionserver/SegmentFactory.java  |   96 +-
 .../hadoop/hbase/regionserver/SegmentScanner.java  |  110 +-
 .../hadoop/hbase/regionserver/SequenceId.java      |    4 +-
 .../hbase/regionserver/ServerNonceManager.java     |   54 +-
 .../apache/hadoop/hbase/regionserver/Shipper.java  |    3 +-
 .../hadoop/hbase/regionserver/ShipperListener.java |    6 +-
 .../hadoop/hbase/regionserver/ShutdownHook.java    |  133 +-
 .../regionserver/SimpleRpcSchedulerFactory.java    |   29 +-
 .../hbase/regionserver/SnapshotRegionCallable.java |    9 +-
 .../hbase/regionserver/SnapshotSegmentScanner.java |   18 +-
 .../hbase/regionserver/SnapshotVerifyCallable.java |    8 +-
 .../hadoop/hbase/regionserver/SplitLogWorker.java  |   51 +-
 .../hadoop/hbase/regionserver/SplitRequest.java    |   25 +-
 .../hbase/regionserver/SplitWALCallable.java       |   21 +-
 .../hbase/regionserver/SteppingSplitPolicy.java    |   11 +-
 .../apache/hadoop/hbase/regionserver/Store.java    |   25 +-
 .../hbase/regionserver/StoreConfigInformation.java |   20 +-
 .../hadoop/hbase/regionserver/StoreContext.java    |    4 +-
 .../hadoop/hbase/regionserver/StoreEngine.java     |   37 +-
 .../hadoop/hbase/regionserver/StoreFile.java       |    3 +-
 .../hbase/regionserver/StoreFileComparators.java   |    2 +-
 .../hadoop/hbase/regionserver/StoreFileInfo.java   |  191 +-
 .../hbase/regionserver/StoreFileManager.java       |   56 +-
 .../hadoop/hbase/regionserver/StoreFileReader.java |  215 +-
 .../hbase/regionserver/StoreFileScanner.java       |  125 +-
 .../hadoop/hbase/regionserver/StoreFileWriter.java |  144 +-
 .../hbase/regionserver/StoreFlushContext.java      |   42 +-
 .../hadoop/hbase/regionserver/StoreFlusher.java    |   40 +-
 .../hadoop/hbase/regionserver/StoreScanner.java    |  291 +-
 .../hadoop/hbase/regionserver/StoreUtils.java      |   30 +-
 .../regionserver/StorefileRefresherChore.java      |   55 +-
 .../hbase/regionserver/StripeMultiFileWriter.java  |  111 +-
 .../hbase/regionserver/StripeStoreConfig.java      |   72 +-
 .../hbase/regionserver/StripeStoreEngine.java      |   25 +-
 .../hbase/regionserver/StripeStoreFileManager.java |  249 +-
 .../hbase/regionserver/StripeStoreFlusher.java     |   25 +-
 .../regionserver/ThreadSafeMemStoreSizing.java     |    7 +-
 .../hbase/regionserver/TimeRangeTracker.java       |   63 +-
 .../hbase/regionserver/VersionedSegmentsList.java  |   20 +-
 .../compactions/AbstractMultiOutputCompactor.java  |   12 +-
 .../regionserver/compactions/CloseChecker.java     |    8 +-
 .../compactions/CompactionConfiguration.java       |  124 +-
 .../compactions/CompactionContext.java             |   26 +-
 .../compactions/CompactionLifeCycleTracker.java    |    2 +-
 .../regionserver/compactions/CompactionPolicy.java |   15 +-
 .../compactions/CompactionProgress.java            |   32 +-
 .../compactions/CompactionRequest.java             |    6 +-
 .../compactions/CompactionRequestImpl.java         |   38 +-
 .../compactions/CompactionRequester.java           |   12 +-
 .../regionserver/compactions/CompactionWindow.java |    2 +-
 .../compactions/CompactionWindowFactory.java       |    2 +-
 .../hbase/regionserver/compactions/Compactor.java  |  161 +-
 .../compactions/CurrentHourProvider.java           |    2 +-
 .../compactions/DateTieredCompactionPolicy.java    |  102 +-
 .../compactions/DateTieredCompactionRequest.java   |   10 +-
 .../compactions/DateTieredCompactor.java           |   24 +-
 .../regionserver/compactions/DefaultCompactor.java |   10 +-
 .../compactions/ExploringCompactionPolicy.java     |   70 +-
 .../ExponentialCompactionWindowFactory.java        |   16 +-
 .../compactions/FIFOCompactionPolicy.java          |   42 +-
 .../regionserver/compactions/OffPeakHours.java     |   24 +-
 .../compactions/RatioBasedCompactionPolicy.java    |  100 +-
 .../compactions/SortedCompactionPolicy.java        |   92 +-
 .../compactions/StripeCompactionPolicy.java        |  177 +-
 .../regionserver/compactions/StripeCompactor.java  |   50 +-
 .../regionserver/handler/AssignRegionHandler.java  |   28 +-
 .../regionserver/handler/CloseMetaHandler.java     |    9 +-
 .../regionserver/handler/CloseRegionHandler.java   |   49 +-
 .../hbase/regionserver/handler/HandlerUtil.java    |    2 +-
 .../regionserver/handler/OpenMetaHandler.java      |    8 +-
 .../handler/OpenPriorityRegionHandler.java         |    7 +-
 .../regionserver/handler/OpenRegionHandler.java    |  126 +-
 .../regionserver/handler/ParallelSeekHandler.java  |   14 +-
 .../handler/RegionReplicaFlushHandler.java         |   78 +-
 .../handler/UnassignRegionHandler.java             |   38 +-
 .../regionserver/handler/WALSplitterHandler.java   |   71 +-
 .../hbase/regionserver/http/RSDumpServlet.java     |   31 +-
 .../hbase/regionserver/http/RSStatusServlet.java   |   24 +-
 .../regionserver/querymatcher/ColumnCount.java     |    7 +-
 .../regionserver/querymatcher/ColumnTracker.java   |   92 +-
 .../querymatcher/CompactionScanQueryMatcher.java   |   35 +-
 .../regionserver/querymatcher/DeleteTracker.java   |    8 +-
 .../DropDeletesCompactionScanQueryMatcher.java     |   14 +-
 .../querymatcher/ExplicitColumnTracker.java        |   15 +-
 .../IncludeAllCompactionQueryMatcher.java          |    9 +-
 .../MajorCompactionScanQueryMatcher.java           |    9 +-
 .../MinorCompactionScanQueryMatcher.java           |    7 +-
 .../querymatcher/NewVersionBehaviorTracker.java    |  102 +-
 .../querymatcher/NormalUserScanQueryMatcher.java   |   25 +-
 .../querymatcher/RawScanQueryMatcher.java          |   17 +-
 .../querymatcher/ScanDeleteTracker.java            |   21 +-
 .../querymatcher/ScanQueryMatcher.java             |   43 +-
 .../querymatcher/ScanWildcardColumnTracker.java    |   27 +-
 .../StripeCompactionScanQueryMatcher.java          |   20 +-
 .../querymatcher/UserScanQueryMatcher.java         |   40 +-
 .../snapshot/FlushSnapshotSubprocedure.java        |   61 +-
 .../snapshot/RegionServerSnapshotManager.java      |  176 +-
 .../storefiletracker/DefaultStoreFileTracker.java  |    3 +-
 .../FileBasedStoreFileTracker.java                 |    8 +-
 .../InitializeStoreFileTrackerProcedure.java       |    5 +-
 .../MigrationStoreFileTracker.java                 |    2 +-
 ...odifyColumnFamilyStoreFileTrackerProcedure.java |    2 +-
 .../ModifyStoreFileTrackerProcedure.java           |   12 +-
 .../ModifyTableStoreFileTrackerProcedure.java      |    2 +-
 .../storefiletracker/StoreFileListFile.java        |   10 +-
 .../storefiletracker/StoreFileTracker.java         |    2 +-
 .../storefiletracker/StoreFileTrackerBase.java     |   29 +-
 .../storefiletracker/StoreFileTrackerFactory.java  |   20 +-
 .../StoreFileTrackerValidationUtils.java           |   74 +-
 .../CompactionThroughputControllerFactory.java     |   30 +-
 .../throttle/FlushThroughputControllerFactory.java |   32 +-
 .../throttle/NoLimitThroughputController.java      |    4 +-
 ...ressureAwareCompactionThroughputController.java |   69 +-
 .../PressureAwareFlushThroughputController.java    |   59 +-
 .../PressureAwareThroughputController.java         |   35 +-
 .../throttle/StoreHotnessProtector.java            |   74 +-
 .../throttle/ThroughputControlUtil.java            |   11 +-
 .../throttle/ThroughputController.java             |    8 +-
 .../hbase/regionserver/wal/AbstractFSWAL.java      |  152 +-
 .../wal/AbstractProtobufLogWriter.java             |   52 +-
 .../hadoop/hbase/regionserver/wal/AsyncFSWAL.java  |   92 +-
 .../regionserver/wal/AsyncProtobufLogWriter.java   |   48 +-
 .../hbase/regionserver/wal/CompressionContext.java |   53 +-
 .../hadoop/hbase/regionserver/wal/Compressor.java  |   63 +-
 .../regionserver/wal/DamagedWALException.java      |    6 +-
 .../hadoop/hbase/regionserver/wal/FSHLog.java      |  200 +-
 .../hadoop/hbase/regionserver/wal/FSWALEntry.java  |   24 +-
 .../hadoop/hbase/regionserver/wal/MetricsWAL.java  |   23 +-
 .../hbase/regionserver/wal/ProtobufLogReader.java  |  154 +-
 .../hbase/regionserver/wal/ProtobufLogWriter.java  |   17 +-
 .../hadoop/hbase/regionserver/wal/ReaderBase.java  |   33 +-
 .../hbase/regionserver/wal/RingBufferTruck.java    |    7 +-
 .../wal/SecureAsyncProtobufLogWriter.java          |   11 +-
 .../regionserver/wal/SecureProtobufLogReader.java  |   20 +-
 .../regionserver/wal/SecureProtobufLogWriter.java  |    7 +-
 .../hbase/regionserver/wal/SecureWALCellCodec.java |   12 +-
 .../regionserver/wal/SequenceIdAccounting.java     |  121 +-
 .../hadoop/hbase/regionserver/wal/SyncFuture.java  |   21 +-
 .../hbase/regionserver/wal/SyncFutureCache.java    |   26 +-
 .../hbase/regionserver/wal/WALActionsListener.java |   61 +-
 .../hbase/regionserver/wal/WALCellCodec.java       |   92 +-
 .../hbase/regionserver/wal/WALCoprocessorHost.java |   46 +-
 .../hadoop/hbase/regionserver/wal/WALUtil.java     |   56 +-
 .../hbase/replication/BaseReplicationEndpoint.java |   37 +-
 .../hbase/replication/BulkLoadCellFilter.java      |   26 +-
 .../hbase/replication/ChainWALEntryFilter.java     |   11 +-
 .../replication/ClusterMarkingEntryFilter.java     |   31 +-
 .../replication/HBaseReplicationEndpoint.java      |   34 +-
 .../NamespaceTableCfWALEntryFilter.java            |    4 +-
 .../hbase/replication/ReplicationEndpoint.java     |  123 +-
 .../replication/ReplicationSinkServiceImpl.java    |   10 +-
 .../hbase/replication/ScopeWALEntryFilter.java     |    3 +-
 .../replication/SystemTableWALEntryFilter.java     |    4 +-
 .../VerifyWALEntriesReplicationEndpoint.java       |    2 +-
 .../hadoop/hbase/replication/WALCellFilter.java    |   14 +-
 .../hadoop/hbase/replication/WALEntryFilter.java   |   18 +-
 .../master/ReplicationHFileCleaner.java            |   18 +-
 .../replication/master/ReplicationLogCleaner.java  |   10 +-
 .../master/ReplicationPeerConfigUpgrader.java      |   21 +-
 .../regionserver/CatalogReplicationSourcePeer.java |   24 +-
 .../ClaimReplicationQueueCallable.java             |    2 +-
 .../DefaultSourceFSConfigurationProvider.java      |   35 +-
 .../regionserver/DumpReplicationQueues.java        |   57 +-
 .../HBaseInterClusterReplicationEndpoint.java      |  146 +-
 .../replication/regionserver/HFileReplicator.java  |   91 +-
 .../replication/regionserver/MetricsSink.java      |   31 +-
 .../replication/regionserver/MetricsSource.java    |   85 +-
 .../regionserver/NoopReplicationQueueStorage.java  |   42 +-
 .../regionserver/PeerProcedureHandler.java         |    3 +-
 .../regionserver/PeerProcedureHandlerImpl.java     |   10 +-
 .../regionserver/RecoveredReplicationSource.java   |   19 +-
 .../RecoveredReplicationSourceShipper.java         |   10 +-
 .../regionserver/RefreshPeerCallable.java          |    2 +-
 .../RegionReplicaReplicationEndpoint.java          |  178 +-
 .../replication/regionserver/Replication.java      |   63 +-
 .../replication/regionserver/ReplicationLoad.java  |   50 +-
 .../regionserver/ReplicationObserver.java          |   23 +-
 .../regionserver/ReplicationRuntimeException.java  |    8 +-
 .../replication/regionserver/ReplicationSink.java  |  156 +-
 .../regionserver/ReplicationSinkManager.java       |   56 +-
 .../regionserver/ReplicationSource.java            |  190 +-
 .../regionserver/ReplicationSourceFactory.java     |   17 +-
 .../regionserver/ReplicationSourceInterface.java   |   42 +-
 .../regionserver/ReplicationSourceLogQueue.java    |   25 +-
 .../regionserver/ReplicationSourceManager.java     |  162 +-
 .../regionserver/ReplicationSourceShipper.java     |   87 +-
 .../ReplicationSourceWALActionListener.java        |    9 +-
 .../regionserver/ReplicationSourceWALReader.java   |   80 +-
 .../regionserver/ReplicationStatus.java            |    2 +-
 .../regionserver/ReplicationSyncUp.java            |    8 +-
 .../regionserver/ReplicationThrottler.java         |   40 +-
 .../regionserver/SerialReplicationChecker.java     |   16 +-
 .../SerialReplicationSourceWALReader.java          |    8 +-
 .../SourceFSConfigurationProvider.java             |   28 +-
 .../SwitchRpcThrottleRemoteCallable.java           |    2 +-
 .../replication/regionserver/WALEntryBatch.java    |   11 +-
 .../WALEntryFilterRetryableException.java          |    9 +-
 .../regionserver/WALEntrySinkFilter.java           |   24 +-
 .../replication/regionserver/WALEntryStream.java   |   44 +-
 .../regionserver/WALFileLengthProvider.java        |   11 +-
 .../hadoop/hbase/security/HBasePolicyProvider.java |   24 +-
 .../hadoop/hbase/security/HBaseSaslRpcServer.java  |   10 +-
 .../apache/hadoop/hbase/security/SecurityUtil.java |    3 +-
 .../hbase/security/access/AccessChecker.java       |  251 +-
 .../hbase/security/access/AccessControlFilter.java |   69 +-
 .../hbase/security/access/AccessController.java    |  981 ++++---
 .../hadoop/hbase/security/access/AuthManager.java  |  140 +-
 .../hadoop/hbase/security/access/AuthResult.java   |   89 +-
 .../access/CoprocessorWhitelistMasterObserver.java |   73 +-
 .../hbase/security/access/NoopAccessChecker.java   |   21 +-
 .../hbase/security/access/PermissionStorage.java   |  237 +-
 .../access/SnapshotScannerHDFSAclCleaner.java      |    9 +-
 .../access/SnapshotScannerHDFSAclController.java   |  193 +-
 .../access/SnapshotScannerHDFSAclHelper.java       |  180 +-
 .../hbase/security/access/ZKPermissionWatcher.java |   41 +-
 .../AttemptingUserProvidingSaslServer.java         |   10 +-
 .../DigestSaslServerAuthenticationProvider.java    |   31 +-
 .../GssSaslServerAuthenticationProvider.java       |   27 +-
 .../provider/SaslServerAuthenticationProvider.java |   12 +-
 .../SaslServerAuthenticationProviders.java         |   47 +-
 .../SimpleSaslServerAuthenticationProvider.java    |   11 +-
 .../hbase/security/token/AuthenticationKey.java    |   28 +-
 .../token/AuthenticationTokenSecretManager.java    |  100 +-
 .../hbase/security/token/FsDelegationToken.java    |   24 +-
 .../hadoop/hbase/security/token/TokenProvider.java |   60 +-
 .../hadoop/hbase/security/token/TokenUtil.java     |  117 +-
 .../hbase/security/token/ZKSecretWatcher.java      |   68 +-
 .../DefaultVisibilityLabelServiceImpl.java         |  173 +-
 .../DefinedSetFilterScanLabelGenerator.java        |   18 +-
 .../visibility/EnforcingScanLabelGenerator.java    |   14 +-
 .../security/visibility/ExpressionExpander.java    |   33 +-
 .../security/visibility/ExpressionParser.java      |   75 +-
 .../visibility/FeedUserAuthScanLabelGenerator.java |   26 +-
 .../hbase/security/visibility/ParseException.java  |    2 +-
 .../security/visibility/ScanLabelGenerator.java    |   15 +-
 .../visibility/SimpleScanLabelGenerator.java       |    5 +-
 .../security/visibility/VisibilityController.java  |  220 +-
 .../visibility/VisibilityExpEvaluator.java         |    6 +-
 .../security/visibility/VisibilityLabelFilter.java |   30 +-
 .../visibility/VisibilityLabelOrdinalProvider.java |    2 +-
 .../visibility/VisibilityLabelService.java         |  121 +-
 .../visibility/VisibilityLabelServiceManager.java  |   23 +-
 .../security/visibility/VisibilityLabelsCache.java |   25 +-
 .../VisibilityNewVersionBehaivorTracker.java       |   69 +-
 .../security/visibility/VisibilityReplication.java |   20 +-
 .../visibility/VisibilityReplicationEndpoint.java  |   27 +-
 .../visibility/VisibilityScanDeleteTracker.java    |   70 +-
 .../hbase/security/visibility/VisibilityUtils.java |  102 +-
 .../visibility/ZKVisibilityLabelWatcher.java       |   27 +-
 .../visibility/expression/ExpressionNode.java      |    2 +-
 .../visibility/expression/LeafExpressionNode.java  |    2 +-
 .../expression/NonLeafExpressionNode.java          |    3 +-
 .../security/visibility/expression/Operator.java   |    6 +-
 .../hbase/server/trace/IpcServerSpanBuilder.java   |   25 +-
 .../hadoop/hbase/snapshot/CreateSnapshot.java      |   69 +-
 .../hbase/snapshot/RestoreSnapshotHelper.java      |  420 ++-
 .../hbase/snapshot/SnapshotDescriptionUtils.java   |  180 +-
 .../apache/hadoop/hbase/snapshot/SnapshotInfo.java |  327 ++-
 .../hadoop/hbase/snapshot/SnapshotManifest.java    |  157 +-
 .../hadoop/hbase/snapshot/SnapshotManifestV1.java  |   57 +-
 .../hadoop/hbase/snapshot/SnapshotManifestV2.java  |   51 +-
 .../hbase/snapshot/SnapshotReferenceUtil.java      |  164 +-
 .../apache/hadoop/hbase/tool/BulkLoadHFiles.java   |   14 +-
 .../hadoop/hbase/tool/BulkLoadHFilesTool.java      |   10 +-
 .../java/org/apache/hadoop/hbase/tool/Canary.java  |    8 +-
 .../hadoop/hbase/tool/CanaryStatusServlet.java     |    7 +-
 .../org/apache/hadoop/hbase/tool/CanaryTool.java   |  450 ++--
 .../hbase/tool/DataBlockEncodingValidator.java     |   17 +-
 .../hadoop/hbase/tool/HFileContentValidator.java   |    8 +-
 .../hadoop/hbase/tool/LoadIncrementalHFiles.java   |  402 +--
 .../hadoop/hbase/tool/PreUpgradeValidator.java     |   14 +-
 .../hadoop/hbase/tool/WriteSinkCoprocessor.java    |   32 +-
 .../coprocessor/Branch1CoprocessorMethods.java     | 1754 +++++--------
 .../hbase/tool/coprocessor/CoprocessorMethod.java  |   14 +-
 .../hbase/tool/coprocessor/CoprocessorMethods.java |   20 +-
 .../tool/coprocessor/CoprocessorValidator.java     |   67 +-
 .../tool/coprocessor/CoprocessorViolation.java     |   18 +-
 .../coprocessor/CurrentCoprocessorMethods.java     |    4 +-
 .../hbase/util/AbstractFileStatusFilter.java       |   28 +-
 .../org/apache/hadoop/hbase/util/BloomContext.java |   18 +-
 .../org/apache/hadoop/hbase/util/BloomFilter.java  |   82 +-
 .../apache/hadoop/hbase/util/BloomFilterBase.java  |    4 +-
 .../apache/hadoop/hbase/util/BloomFilterChunk.java |   80 +-
 .../hadoop/hbase/util/BloomFilterFactory.java      |  124 +-
 .../apache/hadoop/hbase/util/BloomFilterUtil.java  |  168 +-
 .../hadoop/hbase/util/BloomFilterWriter.java       |   15 +-
 .../hbase/util/BoundedPriorityBlockingQueue.java   |   61 +-
 .../hadoop/hbase/util/CollectionBackedScanner.java |   22 +-
 .../apache/hadoop/hbase/util/CompressionTest.java  |   59 +-
 .../hadoop/hbase/util/ConfigurationUtil.java       |   38 +-
 .../apache/hadoop/hbase/util/ConnectionCache.java  |   45 +-
 .../hbase/util/CoprocessorConfigurationUtil.java   |    2 +-
 .../hadoop/hbase/util/DirectMemoryUtils.java       |   44 +-
 .../apache/hadoop/hbase/util/EncryptionTest.java   |   69 +-
 .../apache/hadoop/hbase/util/FSRegionScanner.java  |   43 +-
 .../hadoop/hbase/util/FSTableDescriptors.java      |  172 +-
 .../java/org/apache/hadoop/hbase/util/FSUtils.java |  730 +++---
 .../org/apache/hadoop/hbase/util/FSVisitor.java    |   31 +-
 .../apache/hadoop/hbase/util/FileStatusFilter.java |   13 +-
 .../apache/hadoop/hbase/util/GetJavaProperty.java  |   12 +-
 .../apache/hadoop/hbase/util/HBaseConfTool.java    |    7 +-
 .../org/apache/hadoop/hbase/util/HBaseFsck.java    | 1230 ++++-----
 .../apache/hadoop/hbase/util/HBaseFsckRepair.java  |   92 +-
 .../apache/hadoop/hbase/util/HFileArchiveUtil.java |   32 +-
 .../org/apache/hadoop/hbase/util/HashedBytes.java  |   12 +-
 .../hadoop/hbase/util/HbckErrorReporter.java       |   51 +-
 .../apache/hadoop/hbase/util/HbckRegionInfo.java   |   37 +-
 .../apache/hadoop/hbase/util/HbckTableInfo.java    |  317 ++-
 .../apache/hadoop/hbase/util/IdReadWriteLock.java  |   11 +-
 .../apache/hadoop/hbase/util/JVMClusterUtil.java   |  149 +-
 .../apache/hadoop/hbase/util/JvmPauseMonitor.java  |   54 +-
 .../org/apache/hadoop/hbase/util/JvmVersion.java   |   10 +-
 .../org/apache/hadoop/hbase/util/KeyRange.java     |    3 +-
 .../hbase/util/LeaseNotRecoveredException.java     |   10 +-
 .../apache/hadoop/hbase/util/LossyCounting.java    |   41 +-
 .../hadoop/hbase/util/ManualEnvironmentEdge.java   |    5 +-
 .../hadoop/hbase/util/ModifyRegionUtils.java       |   95 +-
 .../org/apache/hadoop/hbase/util/MoveWithAck.java  |   29 +-
 .../apache/hadoop/hbase/util/MoveWithoutAck.java   |   11 +-
 .../apache/hadoop/hbase/util/MultiHConnection.java |   40 +-
 .../hadoop/hbase/util/MunkresAssignment.java       |   69 +-
 .../hbase/util/NettyEventLoopGroupConfig.java      |   11 +-
 .../org/apache/hadoop/hbase/util/RegionMover.java  |  161 +-
 .../hadoop/hbase/util/RegionSplitCalculator.java   |   90 +-
 .../apache/hadoop/hbase/util/RegionSplitter.java   |  507 ++--
 .../hadoop/hbase/util/RollingStatCalculator.java   |   60 +-
 .../apache/hadoop/hbase/util/RowBloomContext.java  |    3 +-
 .../hadoop/hbase/util/RowColBloomContext.java      |    7 +-
 .../util/RowPrefixFixedLengthBloomContext.java     |   13 +-
 .../hadoop/hbase/util/ServerCommandLine.java       |   52 +-
 .../hadoop/hbase/util/ServerRegionReplicaUtil.java |   88 +-
 .../hadoop/hbase/util/ShutdownHookManager.java     |   21 +-
 .../org/apache/hadoop/hbase/util/SortedList.java   |   48 +-
 .../apache/hadoop/hbase/util/StealJobQueue.java    |   29 +-
 .../hadoop/hbase/util/TableDescriptorChecker.java  |   83 +-
 .../hadoop/hbase/util/YammerHistogramUtils.java    |   68 +-
 .../apache/hadoop/hbase/util/ZKDataMigrator.java   |   74 +-
 .../util/compaction/ClusterCompactionQueues.java   |    8 +-
 .../util/compaction/MajorCompactionRequest.java    |   50 +-
 .../util/compaction/MajorCompactionTTLRequest.java |   14 +-
 .../hbase/util/compaction/MajorCompactor.java      |  215 +-
 .../hbase/util/compaction/MajorCompactorTTL.java   |   33 +-
 .../hbase/util/hbck/HFileCorruptionChecker.java    |  144 +-
 .../hadoop/hbase/util/hbck/OfflineMetaRepair.java  |    9 +-
 .../hadoop/hbase/util/hbck/ReplicationChecker.java |   20 +-
 .../util/hbck/TableIntegrityErrorHandler.java      |   52 +-
 .../util/hbck/TableIntegrityErrorHandlerImpl.java  |   19 +-
 .../hadoop/hbase/wal/AbstractFSWALProvider.java    |   36 +-
 .../wal/AbstractRecoveredEditsOutputSink.java      |   44 +-
 .../apache/hadoop/hbase/wal/AbstractWALRoller.java |   29 +-
 .../hadoop/hbase/wal/AsyncFSWALProvider.java       |   43 +-
 .../hadoop/hbase/wal/BoundedEntryBuffers.java      |   11 +-
 .../hadoop/hbase/wal/BoundedGroupingStrategy.java  |    8 +-
 .../hbase/wal/BoundedRecoveredEditsOutputSink.java |   20 +-
 .../wal/BoundedRecoveredHFilesOutputSink.java      |   36 +-
 .../hadoop/hbase/wal/DisabledWALProvider.java      |   31 +-
 .../org/apache/hadoop/hbase/wal/EntryBuffers.java  |   10 +-
 .../apache/hadoop/hbase/wal/FSHLogProvider.java    |   37 +-
 .../hbase/wal/NamespaceGroupingStrategy.java       |   11 +-
 .../hbase/wal/NettyAsyncFSWALConfigHelper.java     |   11 +-
 .../org/apache/hadoop/hbase/wal/OutputSink.java    |   18 +-
 .../hadoop/hbase/wal/RecoveredEditsOutputSink.java |   23 +-
 .../hadoop/hbase/wal/RegionGroupingProvider.java   |   48 +-
 .../main/java/org/apache/hadoop/hbase/wal/WAL.java |  161 +-
 .../java/org/apache/hadoop/hbase/wal/WALEdit.java  |  194 +-
 .../org/apache/hadoop/hbase/wal/WALFactory.java    |  131 +-
 .../java/org/apache/hadoop/hbase/wal/WALKey.java   |   49 +-
 .../org/apache/hadoop/hbase/wal/WALKeyImpl.java    |  349 +--
 .../apache/hadoop/hbase/wal/WALPrettyPrinter.java  |  177 +-
 .../org/apache/hadoop/hbase/wal/WALProvider.java   |   33 +-
 .../org/apache/hadoop/hbase/wal/WALSplitUtil.java  |  102 +-
 .../org/apache/hadoop/hbase/wal/WALSplitter.java   |  113 +-
 hbase-server/src/main/python/hbase/merge_conf.py   |    1 -
 .../hadoop/hbase/AcidGuaranteesTestBase.java       |   10 +-
 .../hadoop/hbase/AcidGuaranteesTestTool.java       |   19 +-
 .../hbase/ClearUserNamespacesAndTablesRule.java    |   91 +-
 .../org/apache/hadoop/hbase/ConnectionRule.java    |   33 +-
 .../org/apache/hadoop/hbase/GenericTestUtils.java  |   87 +-
 .../java/org/apache/hadoop/hbase/HBaseCluster.java |  159 +-
 .../org/apache/hadoop/hbase/HBaseTestCase.java     |  224 +-
 .../apache/hadoop/hbase/HBaseTestingUtility.java   | 2105 +++++++--------
 .../hadoop/hbase/HFilePerformanceEvaluation.java   |  193 +-
 .../java/org/apache/hadoop/hbase/HTestConst.java   |   25 +-
 .../org/apache/hadoop/hbase/MetaMockingUtil.java   |   67 +-
 .../org/apache/hadoop/hbase/MiniClusterRule.java   |   22 +-
 .../org/apache/hadoop/hbase/MiniHBaseCluster.java  |  280 +-
 .../hadoop/hbase/MockRegionServerServices.java     |   14 +-
 .../apache/hadoop/hbase/MultithreadedTestUtil.java |   32 +-
 .../hadoop/hbase/PerformanceEvaluationCommons.java |   34 +-
 .../org/apache/hadoop/hbase/ProcedureTestUtil.java |    8 +-
 .../org/apache/hadoop/hbase/QosTestHelper.java     |   16 +-
 .../hadoop/hbase/StartMiniClusterOption.java       |   20 +-
 .../TestAcidGuaranteesWithAdaptivePolicy.java      |    4 +-
 .../hbase/TestAcidGuaranteesWithBasicPolicy.java   |    4 +-
 .../hbase/TestAcidGuaranteesWithEagerPolicy.java   |    2 +-
 .../TestAcidGuaranteesWithNoInMemCompaction.java   |    2 +-
 .../apache/hadoop/hbase/TestCachedClusterId.java   |    8 +-
 .../apache/hadoop/hbase/TestCheckTestClasses.java  |   11 +-
 .../hadoop/hbase/TestClientClusterMetrics.java     |  162 +-
 .../hadoop/hbase/TestClientClusterStatus.java      |   40 +-
 .../hadoop/hbase/TestClientOperationTimeout.java   |   14 +-
 .../apache/hadoop/hbase/TestClusterBootOrder.java  |   22 +-
 .../hadoop/hbase/TestClusterPortAssignment.java    |   14 +-
 .../hbase/TestFSTableDescriptorForceCreation.java  |   22 +-
 .../hadoop/hbase/TestFullLogReconstruction.java    |    4 +-
 .../hadoop/hbase/TestGlobalMemStoreSize.java       |   66 +-
 .../org/apache/hadoop/hbase/TestHBaseMetaEdit.java |   43 +-
 .../hadoop/hbase/TestHBaseOnOtherDfsCluster.java   |    8 +-
 .../hadoop/hbase/TestHBaseTestingUtility.java      |   99 +-
 .../TestHColumnDescriptorDefaultVersions.java      |   14 +-
 .../hadoop/hbase/TestHDFSBlocksDistribution.java   |   42 +-
 .../apache/hadoop/hbase/TestHRegionLocation.java   |   24 +-
 .../org/apache/hadoop/hbase/TestIOFencing.java     |  109 +-
 .../hbase/TestIPv6NIOServerSocketChannel.java      |   56 +-
 .../org/apache/hadoop/hbase/TestInfoServers.java   |   31 +-
 .../hadoop/hbase/TestJMXConnectorServer.java       |    8 +-
 .../org/apache/hadoop/hbase/TestJMXListener.java   |   26 +-
 .../apache/hadoop/hbase/TestLocalHBaseCluster.java |   27 +-
 .../apache/hadoop/hbase/TestMetaTableAccessor.java |  373 +--
 .../hbase/TestMetaTableAccessorNoCluster.java      |  111 +-
 .../apache/hadoop/hbase/TestMetaTableLocator.java  |    4 +-
 .../apache/hadoop/hbase/TestMovedRegionCache.java  |   15 +-
 .../org/apache/hadoop/hbase/TestMultiVersions.java |   79 +-
 .../org/apache/hadoop/hbase/TestNamespace.java     |   74 +-
 .../hadoop/hbase/TestNodeHealthCheckChore.java     |   19 +-
 .../hbase/TestPartialResultsFromClientSide.java    |  174 +-
 .../org/apache/hadoop/hbase/TestRegionLoad.java    |   71 +-
 .../org/apache/hadoop/hbase/TestRegionMetrics.java |   42 +-
 .../apache/hadoop/hbase/TestRegionRebalancing.java |   99 +-
 .../TestSequenceIdMonotonicallyIncreasing.java     |    6 +-
 .../org/apache/hadoop/hbase/TestSerialization.java |  347 +--
 .../org/apache/hadoop/hbase/TestServerLoad.java    |    9 +-
 .../org/apache/hadoop/hbase/TestServerMetrics.java |   71 +-
 .../TestServerSideScanMetricsFromClientSide.java   |   38 +-
 .../java/org/apache/hadoop/hbase/TestSize.java     |   22 +-
 .../org/apache/hadoop/hbase/TestSplitMerge.java    |   18 +-
 .../apache/hadoop/hbase/TestTagRewriteCell.java    |   15 +-
 .../org/apache/hadoop/hbase/TestZooKeeper.java     |   46 +-
 .../org/apache/hadoop/hbase/TimestampTestBase.java |  142 +-
 .../hadoop/hbase/backup/TestHFileArchiving.java    |  123 +-
 .../example/TestZooKeeperTableArchiveClient.java   |   50 +-
 .../AbstractTestAsyncTableRegionReplicasRead.java  |    8 +-
 .../hbase/client/AbstractTestAsyncTableScan.java   |   53 +-
 .../client/AbstractTestCIOperationTimeout.java     |    8 +-
 .../hbase/client/AbstractTestCIRpcTimeout.java     |   12 +-
 .../hadoop/hbase/client/AbstractTestCITimeout.java |   18 +-
 .../hbase/client/AbstractTestRegionLocator.java    |   10 +-
 .../client/AbstractTestResultScannerCursor.java    |   11 +-
 .../hbase/client/AbstractTestScanCursor.java       |   17 +-
 .../client/AbstractTestUpdateConfiguration.java    |   33 +-
 .../hbase/client/BufferingScanResultConsumer.java  |    7 +-
 .../hbase/client/ClientPushbackTestBase.java       |    8 +-
 ...shotFromClientAfterSplittingRegionTestBase.java |    4 +-
 ...hotFromClientCloneLinksAfterDeleteTestBase.java |    4 +-
 .../CloneSnapshotFromClientErrorTestBase.java      |    2 +-
 .../CloneSnapshotFromClientNormalTestBase.java     |    4 +-
 .../client/CloneSnapshotFromClientTestBase.java    |    4 +-
 .../hbase/client/ColumnCountOnRowFilter.java       |    5 +-
 .../hadoop/hbase/client/FromClientSideBase.java    |  599 ++---
 .../hbase/client/HConnectionTestingUtility.java    |  143 +-
 .../hbase/client/MetaWithReplicasTestBase.java     |    2 +-
 .../hbase/client/RegionReplicaTestHelper.java      |   17 +-
 ...hotFromClientAfterSplittingRegionsTestBase.java |    4 +-
 ...oreSnapshotFromClientAfterTruncateTestBase.java |    4 +-
 .../RestoreSnapshotFromClientCloneTestBase.java    |    2 +-
 ...apshotFromClientGetCompactionStateTestBase.java |    6 +-
 ...toreSnapshotFromClientSchemaChangeTestBase.java |    4 +-
 .../RestoreSnapshotFromClientSimpleTestBase.java   |    2 +-
 .../client/RestoreSnapshotFromClientTestBase.java  |    4 +-
 .../hbase/client/SnapshotWithAclTestBase.java      |   15 +-
 .../org/apache/hadoop/hbase/client/TestAdmin.java  |   15 +-
 .../org/apache/hadoop/hbase/client/TestAdmin1.java |   31 +-
 .../org/apache/hadoop/hbase/client/TestAdmin2.java |  187 +-
 .../org/apache/hadoop/hbase/client/TestAdmin3.java |   21 +-
 .../org/apache/hadoop/hbase/client/TestAdmin4.java |   14 +-
 .../apache/hadoop/hbase/client/TestAdminBase.java  |    2 +-
 .../client/TestAllowPartialScanResultCache.java    |    6 +-
 .../hbase/client/TestAlwaysSetScannerId.java       |    4 +-
 .../hbase/client/TestAppendFromClientSide.java     |   10 +-
 .../client/TestAsyncAccessControlAdminApi.java     |   53 +-
 .../hadoop/hbase/client/TestAsyncAdminBase.java    |   19 +-
 .../hadoop/hbase/client/TestAsyncAdminBuilder.java |   28 +-
 .../hbase/client/TestAsyncAdminMasterSwitch.java   |    2 +-
 .../TestAsyncAdminModifyStoreFileTracker.java      |    2 +-
 .../client/TestAsyncAdminWithRegionReplicas.java   |   10 +-
 .../hbase/client/TestAsyncBufferMutator.java       |    9 +-
 .../TestAsyncClientPauseForServerOverloaded.java   |   13 +-
 .../hbase/client/TestAsyncClientPushback.java      |    2 +-
 .../hbase/client/TestAsyncClusterAdminApi.java     |   58 +-
 .../hbase/client/TestAsyncClusterAdminApi2.java    |    4 +-
 .../client/TestAsyncDecommissionAdminApi.java      |   15 +-
 .../hbase/client/TestAsyncMetaRegionLocator.java   |    4 +-
 .../hbase/client/TestAsyncNamespaceAdminApi.java   |   11 +-
 .../client/TestAsyncNonMetaRegionLocator.java      |   20 +-
 ...stAsyncNonMetaRegionLocatorConcurrenyLimit.java |   22 +-
 .../hbase/client/TestAsyncProcedureAdminApi.java   |    5 +-
 .../hbase/client/TestAsyncQuotaAdminApi.java       |   40 +-
 .../hbase/client/TestAsyncRegionAdminApi.java      |  113 +-
 .../hbase/client/TestAsyncRegionAdminApi2.java     |   51 +-
 .../hbase/client/TestAsyncRegionLocator.java       |    6 +-
 .../hbase/client/TestAsyncReplicationAdminApi.java |    6 +-
 .../TestAsyncReplicationAdminApiWithClusters.java  |   20 +-
 .../hbase/client/TestAsyncResultScannerCursor.java |    2 +-
 .../TestAsyncSingleRequestRpcRetryingCaller.java   |    6 +-
 .../hbase/client/TestAsyncSnapshotAdminApi.java    |   19 +-
 .../apache/hadoop/hbase/client/TestAsyncTable.java |  555 ++--
 .../hbase/client/TestAsyncTableAdminApi.java       |   52 +-
 .../hbase/client/TestAsyncTableAdminApi2.java      |   21 +-
 .../hbase/client/TestAsyncTableAdminApi3.java      |   31 +-
 .../hadoop/hbase/client/TestAsyncTableBatch.java   |  148 +-
 .../TestAsyncTableBatchRetryImmediately.java       |    2 +-
 .../client/TestAsyncTableGetMultiThreaded.java     |   26 +-
 ...ncTableGetMultiThreadedWithBasicCompaction.java |    8 +-
 ...ncTableGetMultiThreadedWithEagerCompaction.java |    8 +-
 .../hbase/client/TestAsyncTableLocatePrefetch.java |    2 +-
 .../TestAsyncTableLocateRegionForDeletedTable.java |    2 +-
 .../hbase/client/TestAsyncTableNoncedRetry.java    |  119 +-
 .../hbase/client/TestAsyncTableRSCrashPublish.java |   34 +-
 .../hbase/client/TestAsyncTableRegionLocator.java  |    6 +-
 .../client/TestAsyncTableRegionReplicasGet.java    |    2 +-
 .../client/TestAsyncTableRegionReplicasScan.java   |    2 +-
 .../hadoop/hbase/client/TestAsyncTableScan.java    |   46 +-
 .../hadoop/hbase/client/TestAsyncTableScanAll.java |   22 +-
 .../hbase/client/TestAsyncTableScanException.java  |    4 +-
 .../hbase/client/TestAsyncTableScanMetrics.java    |   14 +-
 .../hbase/client/TestAsyncTableScanRenewLease.java |    6 +-
 .../hadoop/hbase/client/TestAsyncTableScanner.java |   20 +-
 .../TestAsyncTableScannerCloseWhileSuspending.java |    9 +-
 .../client/TestAsyncTableUseMetaReplicas.java      |   14 +-
 .../hadoop/hbase/client/TestAsyncToolAdminApi.java |    4 +-
 .../TestAvoidCellReferencesIntoShippedBlocks.java  |   16 +-
 .../hbase/client/TestBatchScanResultCache.java     |   26 +-
 .../hbase/client/TestBlockEvictionFromClient.java  |  132 +-
 .../hbase/client/TestCIDeleteOperationTimeout.java |    4 +-
 .../hbase/client/TestCIDeleteRpcTimeout.java       |    4 +-
 .../hbase/client/TestCIGetOperationTimeout.java    |    4 +-
 .../hadoop/hbase/client/TestCIGetRpcTimeout.java   |    4 +-
 .../hbase/client/TestCIIncrementRpcTimeout.java    |    4 +-
 .../hbase/client/TestCIPutOperationTimeout.java    |    4 +-
 .../hadoop/hbase/client/TestCIPutRpcTimeout.java   |    4 +-
 .../apache/hadoop/hbase/client/TestCISleep.java    |   15 +-
 ...estCatalogReplicaLoadBalanceSimpleSelector.java |   60 +-
 .../hadoop/hbase/client/TestCheckAndMutate.java    |  440 ++--
 .../client/TestCheckAndMutateWithByteBuff.java     |   27 +-
 .../hbase/client/TestCleanupMetaReplica.java       |    2 +-
 .../TestCleanupMetaReplicaThroughConfig.java       |    2 +-
 .../hbase/client/TestClientOperationInterrupt.java |   21 +-
 .../hadoop/hbase/client/TestClientPushback.java    |    2 +-
 .../hbase/client/TestClientScannerRPCTimeout.java  |   26 +-
 .../hbase/client/TestClientSideRegionScanner.java  |    5 +-
 .../hadoop/hbase/client/TestClientTimeouts.java    |   50 +-
 ...loneSnapshotFromClientAfterSplittingRegion.java |    4 +-
 ...oneSnapshotFromClientCloneLinksAfterDelete.java |    4 +-
 .../TestCloneSnapshotFromClientCustomSFT.java      |    8 +-
 .../client/TestCloneSnapshotFromClientError.java   |    2 +-
 .../client/TestCloneSnapshotFromClientNormal.java  |    2 +-
 .../client/TestCompleteResultScanResultCache.java  |    6 +-
 .../hbase/client/TestConnectionImplementation.java |  310 ++-
 .../hadoop/hbase/client/TestConnectionUtils.java   |   12 +-
 .../hbase/client/TestDropTimeoutRequest.java       |   17 +-
 .../hadoop/hbase/client/TestEnableTable.java       |   41 +-
 .../client/TestFailedMetaReplicaAssigment.java     |    2 +-
 .../apache/hadoop/hbase/client/TestFastFail.java   |  123 +-
 .../hadoop/hbase/client/TestFlushFromClient.java   |   37 +-
 .../hadoop/hbase/client/TestFromClientSide.java    |  216 +-
 .../hadoop/hbase/client/TestFromClientSide3.java   |  247 +-
 .../hadoop/hbase/client/TestFromClientSide4.java   |  185 +-
 .../hadoop/hbase/client/TestFromClientSide5.java   |  764 +++---
 .../hbase/client/TestFromClientSideNoCodec.java    |   21 +-
 .../client/TestFromClientSideScanExcpetion.java    |   31 +-
 ...FromClientSideScanExcpetionWithCoprocessor.java |    6 +-
 .../client/TestFromClientSideWithCoprocessor.java  |   13 +-
 .../client/TestFromClientSideWithCoprocessor4.java |   12 +-
 .../client/TestFromClientSideWithCoprocessor5.java |    8 +-
 .../hbase/client/TestGetProcedureResult.java       |   14 +-
 .../TestGetScanColumnsWithNewVersionBehavior.java  |   27 +-
 .../hbase/client/TestGetScanPartialResult.java     |    2 +-
 .../hbase/client/TestHBaseAdminNoCluster.java      |  115 +-
 .../hadoop/hbase/client/TestHTableMultiplexer.java |   34 +-
 .../client/TestHTableMultiplexerFlushCache.java    |   26 +-
 .../hadoop/hbase/client/TestHTableNoncedRetry.java |   78 +-
 .../org/apache/hadoop/hbase/client/TestHbck.java   |   35 +-
 .../hbase/client/TestIllegalTableDescriptor.java   |   17 +-
 .../TestIncreaseMetaReplicaThroughConfig.java      |    2 +-
 ...TestIncrementFromClientSideWithCoprocessor.java |   14 +-
 .../hbase/client/TestIncrementsFromClientSide.java |  123 +-
 .../hbase/client/TestIntraRowPagination.java       |   26 +-
 .../hadoop/hbase/client/TestLeaseRenewal.java      |   14 +-
 .../hbase/client/TestLimitedScanWithFilter.java    |   26 +-
 .../hbase/client/TestMalformedCellFromClient.java  |   37 +-
 .../apache/hadoop/hbase/client/TestMetaCache.java  |  110 +-
 .../hbase/client/TestMetaRegionLocationCache.java  |   34 +-
 .../client/TestMetaReplicasAddressChange.java      |    2 +-
 .../hbase/client/TestMetaWithReplicasBasic.java    |    2 +-
 .../TestMetaWithReplicasShutdownHandling.java      |    2 +-
 ...loneSnapshotFromClientAfterSplittingRegion.java |    4 +-
 ...oneSnapshotFromClientCloneLinksAfterDelete.java |   12 +-
 .../TestMobCloneSnapshotFromClientError.java       |    2 +-
 .../TestMobCloneSnapshotFromClientNormal.java      |    4 +-
 ...oreSnapshotFromClientAfterSplittingRegions.java |    6 +-
 ...tMobRestoreSnapshotFromClientAfterTruncate.java |    6 +-
 .../TestMobRestoreSnapshotFromClientClone.java     |    4 +-
 ...estoreSnapshotFromClientGetCompactionState.java |    6 +-
 ...stMobRestoreSnapshotFromClientSchemaChange.java |    6 +-
 .../TestMobRestoreSnapshotFromClientSimple.java    |    6 +-
 .../client/TestMobSnapshotCloneIndependence.java   |    4 +-
 .../hbase/client/TestMobSnapshotFromClient.java    |    6 +-
 .../client/TestMultiActionMetricsFromClient.java   |    7 +-
 .../hadoop/hbase/client/TestMultiParallel.java     |   91 +-
 .../hbase/client/TestMultiRespectsLimits.java      |   43 +-
 .../hbase/client/TestMultipleTimestamps.java       |  227 +-
 .../hbase/client/TestMvccConsistentScanner.java    |   13 +-
 .../client/TestPutDeleteEtcCellIteration.java      |   42 +-
 .../hadoop/hbase/client/TestPutWithDelete.java     |   27 +-
 .../hbase/client/TestRawAsyncScanCursor.java       |   10 +-
 .../TestRawAsyncTableLimitedScanWithFilter.java    |   18 +-
 .../hbase/client/TestRawAsyncTablePartialScan.java |   17 +-
 .../hadoop/hbase/client/TestRawAsyncTableScan.java |   40 +-
 .../hbase/client/TestRegionLocationCaching.java    |   16 +-
 .../hadoop/hbase/client/TestRegionLocator.java     |    6 +-
 .../hbase/client/TestReplicaWithCluster.java       |  148 +-
 .../hadoop/hbase/client/TestReplicasClient.java    |   49 +-
 .../hbase/client/TestRequestTooBigException.java   |    3 +-
 ...oreSnapshotFromClientAfterSplittingRegions.java |    4 +-
 ...TestRestoreSnapshotFromClientAfterTruncate.java |    4 +-
 .../client/TestRestoreSnapshotFromClientClone.java |    2 +-
 ...estoreSnapshotFromClientGetCompactionState.java |    4 +-
 .../TestRestoreSnapshotFromClientSchemaChange.java |    4 +-
 .../TestRestoreSnapshotFromClientSimple.java       |    2 +-
 .../org/apache/hadoop/hbase/client/TestResult.java |   96 +-
 .../hbase/client/TestResultFromCoprocessor.java    |   18 +-
 .../hbase/client/TestResultScannerCursor.java      |    4 +-
 .../hbase/client/TestResultScannerTracing.java     |   60 +-
 .../hbase/client/TestResultSizeEstimation.java     |   33 +-
 .../hbase/client/TestRpcConnectionRegistry.java    |    2 +-
 .../hbase/client/TestScanWithoutFetchingData.java  |    6 +-
 .../hadoop/hbase/client/TestScannerTimeout.java    |   41 +-
 .../hbase/client/TestScannersFromClientSide.java   |  215 +-
 .../hbase/client/TestScannersFromClientSide2.java  |   18 +-
 .../hbase/client/TestSeparateClientZKCluster.java  |    3 +-
 .../hbase/client/TestServerBusyException.java      |   77 +-
 .../hbase/client/TestServerLoadDurability.java     |   13 +-
 .../hbase/client/TestShortCircuitConnection.java   |    7 +-
 .../client/TestShutdownOfMetaReplicaHolder.java    |    2 +-
 .../hadoop/hbase/client/TestSizeFailures.java      |   25 +-
 .../hbase/client/TestSmallReversedScanner.java     |   18 +-
 .../client/TestSnapshotCloneIndependence.java      |   16 +-
 .../client/TestSnapshotDFSTemporaryDirectory.java  |   20 +-
 .../hbase/client/TestSnapshotFromClient.java       |   49 +-
 .../TestSnapshotFromClientWithRegionReplicas.java  |    6 +-
 .../hadoop/hbase/client/TestSnapshotMetadata.java  |   46 +-
 .../client/TestSnapshotTemporaryDirectory.java     |   67 +-
 ...apshotTemporaryDirectoryWithRegionReplicas.java |    6 +-
 .../hadoop/hbase/client/TestSnapshotWithAcl.java   |    4 +-
 .../client/TestSnapshotWithAclAsyncAdmin.java      |    4 +-
 .../hbase/client/TestSplitOrMergeAtTableLevel.java |   33 +-
 .../hbase/client/TestSplitOrMergeStatus.java       |   39 +-
 .../hadoop/hbase/client/TestTableFavoredNodes.java |   84 +-
 .../hbase/client/TestTableOperationException.java  |   40 +-
 .../hbase/client/TestTableSnapshotScanner.java     |   90 +-
 .../client/TestTableSnapshotScannerWithSFT.java    |    4 +-
 .../hadoop/hbase/client/TestTimestampsFilter.java  |  133 +-
 .../hbase/client/TestUpdateConfiguration.java      |   12 +-
 .../hbase/client/TestZKConnectionRegistry.java     |   31 +-
 .../hbase/client/hamcrest/BytesMatchers.java       |   13 +-
 .../hbase/client/locking/TestEntityLocks.java      |   47 +-
 .../client/replication/TestReplicationAdmin.java   |   40 +-
 .../TestReplicationAdminWithClusters.java          |   19 +-
 ...ReplicationAdminWithTwoDifferentZKClusters.java |    4 +-
 .../hadoop/hbase/codec/CodecPerformance.java       |   52 +-
 .../hadoop/hbase/codec/TestCellMessageCodec.java   |   18 +-
 .../hadoop/hbase/constraint/AllFailConstraint.java |    2 +-
 .../hadoop/hbase/constraint/AllPassConstraint.java |    2 +-
 .../constraint/CheckConfigurationConstraint.java   |   16 +-
 .../hbase/constraint/RuntimeFailConstraint.java    |    5 +-
 .../hadoop/hbase/constraint/TestConstraint.java    |   30 +-
 .../hadoop/hbase/constraint/TestConstraints.java   |   62 +-
 .../hadoop/hbase/constraint/WorksConstraint.java   |    7 +-
 .../coprocessor/SampleRegionWALCoprocessor.java    |   56 +-
 .../hbase/coprocessor/SimpleRegionObserver.java    |  260 +-
 .../hbase/coprocessor/TestAppendTimeRange.java     |   33 +-
 .../coprocessor/TestCoprocessorConfiguration.java  |   54 +-
 .../hbase/coprocessor/TestCoprocessorHost.java     |   39 +-
 .../coprocessor/TestCoprocessorInterface.java      |  130 +-
 .../hbase/coprocessor/TestCoprocessorMetrics.java  |  202 +-
 .../TestCoprocessorShortCircuitRPC.java            |   12 +-
 .../hbase/coprocessor/TestCoprocessorStop.java     |   23 +-
 .../coprocessor/TestCoreMasterCoprocessor.java     |   33 +-
 .../coprocessor/TestCoreRegionCoprocessor.java     |   32 +-
 .../TestCoreRegionServerCoprocessor.java           |   29 +-
 .../TestIncrementAndAppendWithNullResult.java      |   41 +-
 .../hbase/coprocessor/TestIncrementTimeRange.java  |   42 +-
 .../TestMasterCoprocessorExceptionWithAbort.java   |   73 +-
 .../TestMasterCoprocessorExceptionWithRemove.java  |   55 +-
 .../hbase/coprocessor/TestMasterObserver.java      |  521 ++--
 .../TestMasterObserverToModifyTableSchema.java     |   27 +-
 .../hbase/coprocessor/TestMetaTableMetrics.java    |   46 +-
 ...estNegativeMemStoreSizeWithSlowCoprocessor.java |    8 +-
 .../coprocessor/TestOpenTableInCoprocessor.java    |   32 +-
 .../TestPassCustomCellViaRegionObserver.java       |   34 +-
 .../TestPostIncrementAndAppendBeforeWAL.java       |   97 +-
 .../coprocessor/TestReadOnlyConfiguration.java     |    4 +-
 .../coprocessor/TestRegionCoprocessorHost.java     |   22 +-
 .../coprocessor/TestRegionObserverBypass.java      |   81 +-
 ...ObserverForAddingMutationsFromCoprocessors.java |   88 +-
 .../coprocessor/TestRegionObserverInterface.java   |  212 +-
 .../TestRegionObserverPreFlushAndPreCompact.java   |   23 +-
 .../TestRegionObserverScannerOpenHook.java         |   38 +-
 .../coprocessor/TestRegionObserverStacking.java    |   52 +-
 ...tRegionServerCoprocessorExceptionWithAbort.java |   31 +-
 ...RegionServerCoprocessorExceptionWithRemove.java |   34 +-
 .../hadoop/hbase/coprocessor/TestWALObserver.java  |   96 +-
 .../TestForeignExceptionDispatcher.java            |   16 +-
 .../TestForeignExceptionSerialization.java         |   18 +-
 .../TestTimeoutExceptionInjector.java              |   10 +-
 .../hadoop/hbase/executor/TestExecutorService.java |   48 +-
 .../favored/TestFavoredNodeAssignmentHelper.java   |  170 +-
 .../favored/TestStartcodeAgnosticServerName.java   |   10 +-
 .../hadoop/hbase/filter/FilterAllFilter.java       |    7 +-
 .../hadoop/hbase/filter/FilterTestingCluster.java  |   11 +-
 .../hbase/filter/TestBigDecimalComparator.java     |    4 +-
 .../hadoop/hbase/filter/TestBitComparator.java     |   31 +-
 .../hbase/filter/TestColumnPaginationFilter.java   |  123 +-
 .../hbase/filter/TestColumnPrefixFilter.java       |   40 +-
 .../hadoop/hbase/filter/TestColumnRangeFilter.java |   59 +-
 .../hbase/filter/TestComparatorSerialization.java  |   10 +-
 .../hbase/filter/TestDependentColumnFilter.java    |  109 +-
 .../org/apache/hadoop/hbase/filter/TestFilter.java | 1501 +++++------
 .../hbase/filter/TestFilterFromRegionSide.java     |   26 +-
 .../apache/hadoop/hbase/filter/TestFilterList.java |  301 +--
 .../hadoop/hbase/filter/TestFilterListOnMini.java  |   37 +-
 .../filter/TestFilterListOrOperatorWithBlkCnt.java |   21 +-
 .../hbase/filter/TestFilterSerialization.java      |  177 +-
 .../hbase/filter/TestFilterWithScanLimits.java     |   14 +-
 .../hadoop/hbase/filter/TestFilterWrapper.java     |   18 +-
 .../TestFiltersWithBinaryComponentComparator.java  |  176 +-
 .../TestFirstKeyValueMatchingQualifiersFilter.java |   21 +-
 .../filter/TestFuzzyRowAndColumnRangeFilter.java   |   30 +-
 .../hadoop/hbase/filter/TestFuzzyRowFilter.java    |  533 ++--
 .../hbase/filter/TestFuzzyRowFilterEndToEnd.java   |   55 +-
 .../hbase/filter/TestInclusiveStopFilter.java      |   19 +-
 .../hbase/filter/TestInvocationRecordFilter.java   |   56 +-
 .../hbase/filter/TestMultiRowRangeFilter.java      |  118 +-
 .../filter/TestMultipleColumnPrefixFilter.java     |   63 +-
 .../hadoop/hbase/filter/TestNullComparator.java    |    9 +-
 .../apache/hadoop/hbase/filter/TestPageFilter.java |   17 +-
 .../hadoop/hbase/filter/TestParseFilter.java       |  184 +-
 .../hadoop/hbase/filter/TestPrefixFilter.java      |   22 +-
 .../TestQualifierFilterWithEmptyQualifier.java     |   63 +-
 .../hadoop/hbase/filter/TestRandomRowFilter.java   |   25 +-
 .../hadoop/hbase/filter/TestRegexComparator.java   |  161 +-
 .../hadoop/hbase/filter/TestScanRowPrefix.java     |   70 +-
 .../apache/hadoop/hbase/filter/TestSeekHints.java  |   32 +-
 .../filter/TestSingleColumnValueExcludeFilter.java |   26 +-
 .../hbase/filter/TestSingleColumnValueFilter.java  |   87 +-
 .../apache/hadoop/hbase/fs/TestBlockReorder.java   |   61 +-
 .../hbase/fs/TestBlockReorderBlockLocation.java    |   32 +-
 .../hbase/fs/TestBlockReorderMultiBlocks.java      |   69 +-
 .../hadoop/hbase/http/TestInfoServersACL.java      |  177 +-
 .../hbase/io/TestByteBufferOutputStream.java       |    8 +-
 .../hbase/io/TestFSDataInputStreamWrapper.java     |   34 +-
 .../org/apache/hadoop/hbase/io/TestFileLink.java   |   69 +-
 .../org/apache/hadoop/hbase/io/TestHFileLink.java  |   68 +-
 .../hadoop/hbase/io/TestHalfStoreFileReader.java   |   23 +-
 .../org/apache/hadoop/hbase/io/TestHeapSize.java   |  107 +-
 .../hbase/io/TestImmutableBytesWritable.java       |   78 +-
 .../org/apache/hadoop/hbase/io/TestMetricsIO.java  |    8 +-
 .../hadoop/hbase/io/compress/HFileTestBase.java    |   19 +-
 .../io/encoding/TestBufferedDataBlockEncoder.java  |   38 +-
 .../hbase/io/encoding/TestChangingEncoding.java    |   34 +-
 .../hbase/io/encoding/TestDataBlockEncoders.java   |  132 +-
 .../hbase/io/encoding/TestDataBlockEncoding.java   |    4 +-
 .../hbase/io/encoding/TestEncodedSeekers.java      |   41 +-
 .../io/encoding/TestLoadAndSwitchEncodeOnDisk.java |   17 +-
 .../io/encoding/TestSeekBeforeWithReverseScan.java |   10 +-
 .../io/encoding/TestSeekToBlockWithEncoders.java   |  137 +-
 .../hadoop/hbase/io/hfile/CacheTestUtils.java      |   61 +-
 .../apache/hadoop/hbase/io/hfile/KVGenerator.java  |   51 +-
 .../apache/hadoop/hbase/io/hfile/KeySampler.java   |   35 +-
 .../apache/hadoop/hbase/io/hfile/NanoTimer.java    |   88 +-
 .../hadoop/hbase/io/hfile/RandomKeyValueUtil.java  |   43 +-
 .../org/apache/hadoop/hbase/io/hfile/TagUsage.java |   11 +-
 .../hbase/io/hfile/TestBlockCacheReporting.java    |   33 +-
 .../hadoop/hbase/io/hfile/TestBlockIOUtils.java    |   13 +-
 .../hadoop/hbase/io/hfile/TestCacheConfig.java     |   36 +-
 .../hadoop/hbase/io/hfile/TestCacheOnWrite.java    |  188 +-
 .../hbase/io/hfile/TestCachedBlockQueue.java       |   23 +-
 .../apache/hadoop/hbase/io/hfile/TestChecksum.java |  185 +-
 .../hbase/io/hfile/TestCombinedBlockCache.java     |   16 +-
 .../hbase/io/hfile/TestFixedFileTrailer.java       |  125 +-
 .../io/hfile/TestForceCacheImportantBlocks.java    |   39 +-
 .../apache/hadoop/hbase/io/hfile/TestHFile.java    |  275 +-
 .../hadoop/hbase/io/hfile/TestHFileBlock.java      |  351 +--
 .../hadoop/hbase/io/hfile/TestHFileBlockIndex.java |  284 +-
 .../hbase/io/hfile/TestHFileDataBlockEncoder.java  |   89 +-
 .../hadoop/hbase/io/hfile/TestHFileEncryption.java |   87 +-
 .../TestHFileInlineToRootChunkConversion.java      |   29 +-
 .../hbase/io/hfile/TestHFilePrettyPrinter.java     |   29 +-
 .../hadoop/hbase/io/hfile/TestHFileReaderImpl.java |   25 +-
 .../hfile/TestHFileScannerImplReferenceCount.java  |   57 +-
 .../hadoop/hbase/io/hfile/TestHFileSeek.java       |  261 +-
 .../hadoop/hbase/io/hfile/TestHFileWriterV3.java   |  122 +-
 .../hfile/TestHFileWriterV3WithDataEncoders.java   |  119 +-
 .../io/hfile/TestLazyDataBlockDecompression.java   |  101 +-
 .../hbase/io/hfile/TestLruAdaptiveBlockCache.java  |  447 ++--
 .../hadoop/hbase/io/hfile/TestLruBlockCache.java   |  274 +-
 .../hadoop/hbase/io/hfile/TestLruCachedBlock.java  |    6 +-
 .../apache/hadoop/hbase/io/hfile/TestPrefetch.java |   53 +-
 .../apache/hadoop/hbase/io/hfile/TestReseekTo.java |   35 +-
 .../hbase/io/hfile/TestRowIndexV1DataEncoder.java  |    5 +-
 .../hbase/io/hfile/TestScannerFromBucketCache.java |   24 +-
 .../hfile/TestScannerSelectionUsingKeyRange.java   |   20 +-
 .../io/hfile/TestScannerSelectionUsingTTL.java     |   27 +-
 .../io/hfile/TestSeekBeforeWithInlineBlocks.java   |   61 +-
 .../apache/hadoop/hbase/io/hfile/TestSeekTo.java   |   63 +-
 .../hbase/io/hfile/TestTinyLfuBlockCache.java      |   90 +-
 .../hbase/io/hfile/bucket/TestBucketCache.java     |  137 +-
 .../io/hfile/bucket/TestBucketCacheRefCnt.java     |   59 +-
 .../io/hfile/bucket/TestBucketWriterThread.java    |   57 +-
 .../io/hfile/bucket/TestByteBufferIOEngine.java    |    7 +-
 .../bucket/TestExclusiveMemoryMmapEngine.java      |    4 +-
 .../hbase/io/hfile/bucket/TestFileIOEngine.java    |   13 +-
 .../hadoop/hbase/io/hfile/bucket/TestRAMCache.java |   19 +-
 .../io/hfile/bucket/TestVerifyBucketCacheFile.java |   65 +-
 .../apache/hadoop/hbase/ipc/AbstractTestIPC.java   |  186 +-
 .../hadoop/hbase/ipc/DelegatingRpcScheduler.java   |    4 +-
 .../hbase/ipc/MetricsHBaseServerWrapperStub.java   |    5 +-
 .../apache/hadoop/hbase/ipc/TestBlockingIPC.java   |   23 +-
 .../apache/hadoop/hbase/ipc/TestBufferChain.java   |   31 +-
 .../apache/hadoop/hbase/ipc/TestCallRunner.java    |   55 +-
 .../hadoop/hbase/ipc/TestFifoRpcScheduler.java     |   30 +-
 .../apache/hadoop/hbase/ipc/TestHBaseClient.java   |   21 +-
 .../hbase/ipc/TestMasterFifoRpcScheduler.java      |   10 +-
 .../org/apache/hadoop/hbase/ipc/TestNettyIPC.java  |   14 +-
 .../hadoop/hbase/ipc/TestNettyRpcServer.java       |   15 +-
 .../hadoop/hbase/ipc/TestPluggableQueueImpl.java   |   90 +-
 .../apache/hadoop/hbase/ipc/TestProtoBufRpc.java   |   15 +-
 .../hbase/ipc/TestProtobufRpcServiceImpl.java      |   30 +-
 .../hadoop/hbase/ipc/TestRWQueueRpcExecutor.java   |   11 +-
 .../hadoop/hbase/ipc/TestRpcClientLeaks.java       |    6 +-
 .../hadoop/hbase/ipc/TestRpcHandlerException.java  |   10 +-
 .../apache/hadoop/hbase/ipc/TestRpcMetrics.java    |   49 +-
 .../ipc/TestRpcServerSlowConnectionSetup.java      |   12 +-
 .../hbase/ipc/TestRpcServerTraceLogging.java       |   13 +-
 .../hadoop/hbase/ipc/TestSimpleRpcScheduler.java   |  154 +-
 .../hbase/mapreduce/MapreduceTestingShim.java      |   48 +-
 .../hadoop/hbase/master/AbstractTestDLS.java       |   28 +-
 .../hbase/master/AbstractTestRestartCluster.java   |    2 +-
 .../hadoop/hbase/master/AlwaysStandByHMaster.java  |   19 +-
 .../hadoop/hbase/master/DummyRegionProcedure.java  |    8 +-
 .../hbase/master/DummyRegionProcedureState.java    |    2 +-
 .../hadoop/hbase/master/DummyRegionServerList.java |    2 +-
 .../hbase/master/MockNoopMasterServices.java       |   91 +-
 .../hadoop/hbase/master/MockRegionServer.java      |  182 +-
 .../hbase/master/TestActiveMasterManager.java      |   84 +-
 .../hbase/master/TestAlwaysStandByHMaster.java     |   18 +-
 .../hbase/master/TestAssignmentManagerMetrics.java |   25 +-
 .../apache/hadoop/hbase/master/TestBalancer.java   |    7 +-
 .../hbase/master/TestClientMetaServiceRPCs.java    |   58 +-
 .../hbase/master/TestClockSkewDetection.java       |   19 +-
 .../hbase/master/TestCloseAnOpeningRegion.java     |    2 +-
 .../hadoop/hbase/master/TestClusterRestart.java    |    2 +-
 .../hbase/master/TestClusterRestartFailover.java   |   47 +-
 .../TestClusterRestartFailoverSplitWithoutZk.java  |    2 +-
 .../master/TestClusterRestartSplitWithoutZk.java   |    2 +-
 .../hbase/master/TestClusterStatusPublisher.java   |    7 +-
 .../hadoop/hbase/master/TestDLSAsyncFSWAL.java     |    4 +-
 .../apache/hadoop/hbase/master/TestDLSFSHLog.java  |    4 +-
 .../apache/hadoop/hbase/master/TestDeadServer.java |   27 +-
 .../hadoop/hbase/master/TestGetInfoPort.java       |    6 +-
 .../hbase/master/TestGetLastFlushedSequenceId.java |   22 +-
 .../hbase/master/TestGetReplicationLoad.java       |   92 +-
 .../hbase/master/TestHMasterCommandLine.java       |    9 +-
 .../hbase/master/TestHMasterRPCException.java      |   12 +-
 .../hbase/master/TestLoadProcedureError.java       |    6 +-
 .../org/apache/hadoop/hbase/master/TestMaster.java |   65 +-
 .../master/TestMasterAbortAndRSGotKilled.java      |    8 +-
 .../hbase/master/TestMasterBalanceThrottling.java  |   15 +-
 .../hadoop/hbase/master/TestMasterBalancerNPE.java |   40 +-
 .../hbase/master/TestMasterChoreScheduled.java     |   21 +-
 .../master/TestMasterCoprocessorServices.java      |  106 +-
 .../hbase/master/TestMasterDryRunBalancer.java     |   14 +-
 .../hadoop/hbase/master/TestMasterFailover.java    |   38 +-
 .../TestMasterFailoverBalancerPersistence.java     |   29 +-
 .../hadoop/hbase/master/TestMasterFileSystem.java  |   14 +-
 .../TestMasterFileSystemWithStoreFileTracking.java |   11 +-
 .../master/TestMasterFileSystemWithWALDir.java     |    6 +-
 .../TestMasterHandlerFullWhenTransitRegion.java    |   18 +-
 .../hadoop/hbase/master/TestMasterMetrics.java     |   39 +-
 .../hbase/master/TestMasterMetricsWrapper.java     |   39 +-
 .../hadoop/hbase/master/TestMasterNoCluster.java   |   95 +-
 .../hbase/master/TestMasterNotCarryTable.java      |    8 +-
 .../TestMasterOperationsForRegionReplicas.java     |   27 +-
 .../hadoop/hbase/master/TestMasterQosFunction.java |   40 +-
 .../TestMasterRestartAfterDisablingTable.java      |   35 +-
 .../hadoop/hbase/master/TestMasterShutdown.java    |   40 +-
 .../hadoop/hbase/master/TestMasterTransitions.java |  593 ++---
 .../master/TestMergeTableRegionsWhileRSCrash.java  |   29 +-
 .../master/TestMetaAssignmentWithStopMaster.java   |   23 +-
 .../hbase/master/TestMetaShutdownHandler.java      |   49 +-
 .../master/TestMigrateAndMirrorMetaLocations.java  |    2 +-
 .../master/TestMirroringTableStateManager.java     |   34 +-
 .../master/TestNewStartedRegionServerVersion.java  |    2 +-
 .../hadoop/hbase/master/TestRecreateCluster.java   |   42 +-
 .../hadoop/hbase/master/TestRegionPlacement.java   |  233 +-
 .../hadoop/hbase/master/TestRegionPlacement2.java  |   65 +-
 .../apache/hadoop/hbase/master/TestRegionPlan.java |    8 +-
 .../hbase/master/TestRegionPlansWithThrottle.java  |    7 +-
 .../hadoop/hbase/master/TestRegionState.java       |    8 +-
 .../hbase/master/TestRegionsRecoveryChore.java     |   62 +-
 .../master/TestRegionsRecoveryConfigManager.java   |    1 -
 .../master/TestRestartWithEmptyWALDirectory.java   |    4 +-
 .../master/TestRetainAssignmentOnRestart.java      |    8 +-
 ...estRetainAssignmentOnRestartSplitWithoutZk.java |    5 +-
 .../hadoop/hbase/master/TestRollingRestart.java    |   64 +-
 .../master/TestRoundRobinAssignmentOnRestart.java  |   15 +-
 ...oundRobinAssignmentOnRestartSplitWithoutZk.java |    6 +-
 .../TestServerCrashProcedureCarryingMetaStuck.java |    2 +-
 .../master/TestServerCrashProcedureStuck.java      |    2 +-
 .../hbase/master/TestShutdownBackupMaster.java     |   10 +-
 .../master/TestShutdownWithNoRegionServer.java     |    2 +-
 .../hadoop/hbase/master/TestSplitLogManager.java   |   91 +-
 .../hbase/master/TestSplitRegionWhileRSCrash.java  |    5 +-
 .../hadoop/hbase/master/TestSplitWALManager.java   |   69 +-
 .../hadoop/hbase/master/TestTableStateManager.java |   11 +-
 .../hadoop/hbase/master/TestWarmupRegion.java      |   58 +-
 .../master/assignment/AssignmentTestingUtil.java   |   37 +-
 .../master/assignment/MockMasterServices.java      |   69 +-
 .../assignment/TestAMAssignWithRandExec.java       |    2 +-
 .../master/assignment/TestAMServerFailedOpen.java  |    6 +-
 ...estAssignRegionToUninitializedRegionServer.java |    2 +-
 .../master/assignment/TestAssignmentManager.java   |   15 +-
 .../assignment/TestAssignmentManagerBase.java      |   50 +-
 .../TestAssignmentManagerLoadMetaRegionState.java  |    2 +-
 .../assignment/TestAssignmentManagerUtil.java      |    2 +-
 .../master/assignment/TestAssignmentOnRSCrash.java |   20 +-
 .../assignment/TestCloseRegionWhileRSCrash.java    |    6 +-
 .../TestDeadServerMetricRegionChore.java           |    1 +
 .../assignment/TestExceptionInAssignRegion.java    |    9 +-
 .../TestExceptionInUnassignedRegion.java           |    2 +-
 .../hbase/master/assignment/TestHbckChore.java     |   22 +-
 .../TestMasterAbortWhileMergingTable.java          |   44 +-
 .../assignment/TestMergeTableRegionsProcedure.java |   44 +-
 .../assignment/TestModifyTableWhileMerging.java    |   34 +-
 .../assignment/TestOpenRegionProcedureBackoff.java |    2 +-
 .../assignment/TestOpenRegionProcedureHang.java    |   20 +-
 .../assignment/TestRaceBetweenSCPAndDTP.java       |   12 +-
 .../assignment/TestRaceBetweenSCPAndTRSP.java      |    2 +-
 .../TestRegionAssignedToMultipleRegionServers.java |    8 +-
 .../hbase/master/assignment/TestRegionBypass.java  |   71 +-
 .../assignment/TestRegionMoveAndAbandon.java       |    5 +-
 .../master/assignment/TestRegionReplicaSplit.java  |   14 +-
 .../hbase/master/assignment/TestRegionSplit.java   |   29 +-
 .../TestRegionSplitAndSeparateChildren.java        |   29 +-
 .../master/assignment/TestRegionStateStore.java    |   24 +-
 .../hbase/master/assignment/TestRegionStates.java  |   41 +-
 .../assignment/TestReportOnlineRegionsRace.java    |    6 +-
 ...tReportRegionStateTransitionFromDeadServer.java |   14 +-
 .../TestReportRegionStateTransitionRetry.java      |    4 +-
 .../master/assignment/TestRogueRSAssignment.java   |   28 +-
 .../master/assignment/TestSCPGetRegionsRace.java   |   12 +-
 .../assignment/TestSplitTableRegionProcedure.java  |  100 +-
 .../TestTransitRegionStateProcedure.java           |    2 +-
 .../assignment/TestWakeUpUnexpectedProcedure.java  |   16 +-
 .../hbase/master/balancer/BalancerTestBase.java    |  274 +-
 .../hbase/master/balancer/BalancerTestBase2.java   |    2 +-
 .../hbase/master/balancer/DummyCostFunction.java   |    2 +-
 .../balancer/DummyMetricsStochasticBalancer.java   |   21 +-
 .../LoadBalancerPerformanceEvaluation.java         |   32 +-
 .../LoadOnlyFavoredStochasticBalancer.java         |    2 +-
 .../master/balancer/TestBalancerDecision.java      |   16 +-
 .../master/balancer/TestBalancerRejection.java     |   50 +-
 .../TestBalancerStatusTagInJMXMetrics.java         |   12 +-
 .../master/balancer/TestBaseLoadBalancer.java      |  147 +-
 .../hbase/master/balancer/TestDoubleArrayCost.java |    2 +-
 .../balancer/TestFavoredNodeTableImport.java       |    6 +-
 .../TestFavoredStochasticBalancerPickers.java      |   60 +-
 .../TestFavoredStochasticLoadBalancer.java         |   84 +-
 .../master/balancer/TestRegionLocationFinder.java  |   31 +-
 .../balancer/TestRegionsOnMasterOptions.java       |  111 +-
 .../hbase/master/balancer/TestServerAndLoad.java   |    8 +-
 .../master/balancer/TestSimpleLoadBalancer.java    |  124 +-
 .../balancer/TestStochasticBalancerJmxMetrics.java |   10 +-
 .../balancer/TestStochasticLoadBalancer.java       |  180 +-
 .../TestStochasticLoadBalancerBalanceCluster.java  |    8 +-
 ...estStochasticLoadBalancerHeterogeneousCost.java |   73 +-
 ...ochasticLoadBalancerHeterogeneousCostRules.java |   38 +-
 .../TestStochasticLoadBalancerLargeCluster.java    |    4 +-
 .../TestStochasticLoadBalancerMidCluster.java      |    4 +-
 .../TestStochasticLoadBalancerRegionReplica.java   |   12 +-
 ...asticLoadBalancerRegionReplicaLargeCluster.java |    2 +-
 ...chasticLoadBalancerRegionReplicaMidCluster.java |    2 +-
 ...egionReplicaReplicationGreaterThanNumNodes.java |    6 +-
 ...ochasticLoadBalancerRegionReplicaSameHosts.java |    4 +-
 ...ochasticLoadBalancerRegionReplicaWithRacks.java |    6 +-
 .../TestStochasticLoadBalancerSmallCluster.java    |    4 +-
 .../hbase/master/cleaner/TestCleanerChore.java     |    4 +-
 .../hbase/master/cleaner/TestHFileCleaner.java     |   60 +-
 .../hbase/master/cleaner/TestHFileLinkCleaner.java |   12 +-
 .../hbase/master/cleaner/TestLogsCleaner.java      |   82 +-
 .../cleaner/TestReplicationBarrierCleaner.java     |    6 +-
 .../cleaner/TestReplicationHFileCleaner.java       |   29 +-
 .../master/cleaner/TestSnapshotCleanerChore.java   |   44 +-
 .../master/cleaner/TestSnapshotFromMaster.java     |   93 +-
 .../http/TestApiV1ClusterMetricsResource.java      |  111 +-
 .../hbase/master/http/TestMasterStatusServlet.java |   52 +-
 .../hadoop/hbase/master/http/TestMetaBrowser.java  |  161 +-
 .../master/http/TestMetaBrowserNoCluster.java      |   71 +-
 .../hbase/master/http/TestRegionVisualizer.java    |    4 +-
 .../hbase/master/http/gson/GsonFactoryTest.java    |   16 +-
 .../hbase/master/janitor/TestCatalogJanitor.java   |  224 +-
 .../master/janitor/TestCatalogJanitorCluster.java  |   14 +-
 .../janitor/TestCatalogJanitorInMemoryStates.java  |   14 +-
 .../hadoop/hbase/master/janitor/TestMetaFixer.java |  101 +-
 .../hbase/master/locking/TestLockManager.java      |   32 +-
 .../hbase/master/locking/TestLockProcedure.java    |   83 +-
 .../migrate/TestInitializeStoreFileTracker.java    |    7 +-
 ...gionNormalizerManagerConfigurationObserver.java |   16 +-
 .../normalizer/TestRegionNormalizerWorkQueue.java  |   32 +-
 .../normalizer/TestRegionNormalizerWorker.java     |  100 +-
 .../normalizer/TestSimpleRegionNormalizer.java     |  323 +--
 .../TestSimpleRegionNormalizerOnCluster.java       |  183 +-
 .../MasterFailoverWithProceduresTestBase.java      |    2 +-
 ...terProcedureSchedulerPerformanceEvaluation.java |   63 +-
 .../procedure/MasterProcedureTestingUtility.java   |  188 +-
 .../procedure/TestCloneSnapshotProcedure.java      |   37 +-
 .../TestCloneSnapshotProcedureFileBasedSFT.java    |    7 +-
 .../procedure/TestCreateNamespaceProcedure.java    |   53 +-
 .../procedure/TestCreateTableNoRegionServer.java   |   37 +-
 .../master/procedure/TestCreateTableProcedure.java |   61 +-
 .../TestCreateTableProcedureMuitipleRegions.java   |    2 +-
 .../TestCreateTableWithMasterFailover.java         |    2 +-
 .../TestDeleteColumnFamilyProcedureFromClient.java |   16 +-
 .../procedure/TestDeleteNamespaceProcedure.java    |   42 +-
 .../master/procedure/TestDeleteTableProcedure.java |   51 +-
 .../TestDeleteTableWithMasterFailover.java         |    2 +-
 .../procedure/TestDisableTableProcedure.java       |   38 +-
 .../TestDisableTableWithMasterFailover.java        |    2 +-
 .../master/procedure/TestEnableTableProcedure.java |    3 +-
 .../TestEnableTableWithMasterFailover.java         |    2 +-
 .../TestFastFailOnProcedureNotRegistered.java      |   10 +-
 .../hadoop/hbase/master/procedure/TestHBCKSCP.java |   25 +-
 .../hbase/master/procedure/TestHBCKSCPUnknown.java |   15 +-
 .../master/procedure/TestIgnoreUnknownFamily.java  |   39 +-
 .../procedure/TestMasterObserverPostCalls.java     |  110 +-
 .../procedure/TestMasterProcedureEvents.java       |   20 +-
 .../procedure/TestMasterProcedureScheduler.java    |   24 +-
 .../TestMasterProcedureSchedulerConcurrency.java   |   40 +-
 .../procedure/TestModifyNamespaceProcedure.java    |   57 +-
 .../master/procedure/TestModifyTableProcedure.java |  118 +-
 .../hbase/master/procedure/TestProcedureAdmin.java |   47 +-
 .../master/procedure/TestProcedurePriority.java    |    6 +-
 .../TestReopenTableRegionsProcedureBackoff.java    |    2 +-
 ...estReopenTableRegionsProcedureInfiniteLoop.java |    2 +-
 .../procedure/TestRestoreSnapshotProcedure.java    |   31 +-
 .../hadoop/hbase/master/procedure/TestSCP.java     |    2 +-
 .../hadoop/hbase/master/procedure/TestSCPBase.java |    7 +-
 .../hbase/master/procedure/TestSCPWithMeta.java    |    2 +-
 .../procedure/TestSCPWithMetaWithReplicas.java     |    2 +-
 ...CPWithMetaWithReplicasWithoutZKCoordinated.java |    2 +-
 .../TestSCPWithMetaWithoutZKCoordinated.java       |    2 +-
 .../master/procedure/TestSCPWithReplicas.java      |   25 +-
 .../TestSCPWithReplicasWithoutZKCoordinated.java   |    4 +-
 .../hbase/master/procedure/TestSCPWithoutMeta.java |    2 +-
 .../procedure/TestSCPWithoutMetaWithReplicas.java  |    2 +-
 ...ithoutMetaWithReplicasWithoutZKCoordinated.java |    4 +-
 .../TestSCPWithoutMetaWithoutZKCoordinated.java    |    2 +-
 .../procedure/TestSCPWithoutZKCoordinated.java     |    6 +-
 .../procedure/TestSafemodeBringsDownMaster.java    |   22 +-
 .../procedure/TestSchedulerQueueDeadLock.java      |   14 +-
 .../procedure/TestServerRemoteProcedure.java       |   37 +-
 .../master/procedure/TestSnapshotProcedure.java    |   20 +-
 .../TestSnapshotProcedureBasicSnapshot.java        |    3 +-
 .../TestSnapshotProcedureConcurrently.java         |   35 +-
 .../TestSnapshotProcedureMasterRestarts.java       |   19 +-
 .../master/procedure/TestSnapshotProcedureRIT.java |   15 +-
 .../procedure/TestSnapshotProcedureRSCrashes.java  |   15 +-
 .../TestSnapshotProcedureSnapshotCorrupted.java    |   28 +-
 .../procedure/TestSnapshotRegionProcedure.java     |    5 +-
 .../procedure/TestSnapshotVerifyProcedure.java     |   32 +-
 .../master/procedure/TestSplitWALProcedure.java    |   21 +-
 .../procedure/TestTableDDLProcedureBase.java       |    9 +-
 .../TestTableDescriptorModificationFromClient.java |   30 +-
 .../procedure/TestTruncateTableProcedure.java      |   82 +-
 .../TestTruncateTableWithMasterFailover.java       |    2 +-
 .../procedure/TestWALProcedureStoreOnHDFS.java     |   41 +-
 .../hbase/master/region/MasterRegionTestBase.java  |    2 +-
 .../region/TestChangeSFTForMasterRegion.java       |    2 +-
 .../master/region/TestMasterRegionCompaction.java  |    6 +-
 .../hbase/master/region/TestMasterRegionFlush.java |    2 +-
 .../master/region/TestMasterRegionInitialize.java  |    2 +-
 .../region/TestMasterRegionOnTwoFileSystems.java   |    6 +-
 .../master/region/TestMasterRegionWALCleaner.java  |   10 +-
 .../master/region/TestMasterRegionWALRecovery.java |    3 +-
 .../TestModifyPeerProcedureRetryBackoff.java       |   12 +-
 .../master/snapshot/TestSnapshotFileCache.java     |   56 +-
 ...stSnapshotFileCacheWithDifferentWorkingDir.java |   11 +-
 .../master/snapshot/TestSnapshotHFileCleaner.java  |   53 +-
 .../hbase/master/snapshot/TestSnapshotManager.java |   36 +-
 .../master/snapshot/TestTakeSnapshotHandler.java   |   26 +-
 .../org/apache/hadoop/hbase/mob/MobTestUtil.java   |   33 +-
 .../apache/hadoop/hbase/mob/TestCachedMobFile.java |   20 +-
 .../hbase/mob/TestDefaultMobStoreFlusher.java      |  112 +-
 .../hbase/mob/TestExpiredMobFileCleaner.java       |   24 +-
 .../hadoop/hbase/mob/TestMobDataBlockEncoding.java |   18 +-
 .../org/apache/hadoop/hbase/mob/TestMobFile.java   |   22 +-
 .../apache/hadoop/hbase/mob/TestMobFileCache.java  |   33 +-
 .../apache/hadoop/hbase/mob/TestMobFileLink.java   |   13 +-
 .../apache/hadoop/hbase/mob/TestMobFileName.java   |   13 +-
 .../hbase/mob/TestMobWithByteBuffAllocator.java    |    5 +-
 .../hbase/mob/compactions/TestMobCompactor.java    |  218 +-
 .../TestPartitionedMobCompactionRequest.java       |    4 +-
 .../compactions/TestPartitionedMobCompactor.java   |  365 +--
 .../TestMemoryBoundedLogMessageBuffer.java         |   30 +-
 .../hadoop/hbase/monitoring/TestTaskMonitor.java   |   39 +-
 .../hbase/namequeues/TestNamedQueueRecorder.java   |  452 ++--
 .../hbase/namequeues/TestSlowLogAccessor.java      |   26 +-
 .../hbase/namespace/TestNamespaceAuditor.java      |  164 +-
 .../procedure/SimpleMasterProcedureManager.java    |   22 +-
 .../hbase/procedure/SimpleRSProcedureManager.java  |   32 +-
 .../hbase/procedure/TestFailedProcCleanup.java     |   28 +-
 .../hadoop/hbase/procedure/TestProcedure.java      |   29 +-
 .../hbase/procedure/TestProcedureCoordinator.java  |   89 +-
 .../hbase/procedure/TestProcedureDescriber.java    |   25 +-
 .../hbase/procedure/TestProcedureManager.java      |   12 +-
 .../hbase/procedure/TestProcedureMember.java       |  157 +-
 .../hadoop/hbase/procedure/TestZKProcedure.java    |  145 +-
 .../procedure/TestZKProcedureControllers.java      |  128 +-
 .../RegionProcedureStorePerformanceEvaluation.java |    7 +-
 .../store/region/RegionProcedureStoreTestBase.java |    2 +-
 .../region/RegionProcedureStoreTestHelper.java     |    2 +-
 .../region/RegionProcedureStoreTestProcedure.java  |    4 +-
 .../region/TestHFileProcedurePrettyPrinter.java    |    5 +-
 .../store/region/TestRegionProcedureStore.java     |    3 +-
 .../region/TestRegionProcedureStoreMigration.java  |    2 +-
 .../region/TestWALProcedurePrettyPrinter.java      |    2 +-
 .../hadoop/hbase/protobuf/TestProtobufUtil.java    |   94 +-
 .../hbase/protobuf/TestReplicationProtobuf.java    |   12 +-
 .../hbase/quotas/SpaceQuotaHelperForTests.java     |  194 +-
 .../quotas/SpaceQuotaSnapshotNotifierForTest.java  |   27 +-
 .../hbase/quotas/TestActivePolicyEnforcement.java  |   58 +-
 .../quotas/TestClusterScopeQuotaThrottle.java      |   12 +-
 .../hbase/quotas/TestFileArchiverNotifierImpl.java |   53 +-
 .../quotas/TestFileSystemUtilizationChore.java     |   64 +-
 .../hbase/quotas/TestGlobalQuotaSettingsImpl.java  |   62 +-
 .../hbase/quotas/TestLowLatencySpaceQuotas.java    |   86 +-
 .../hbase/quotas/TestMasterQuotaManager.java       |    4 +-
 .../hbase/quotas/TestMasterQuotasObserver.java     |   35 +-
 .../quotas/TestMasterQuotasObserverWithMocks.java  |   19 +-
 .../quotas/TestNamespaceQuotaViolationStore.java   |   74 +-
 .../apache/hadoop/hbase/quotas/TestQuotaAdmin.java |  168 +-
 .../hbase/quotas/TestQuotaObserverChore.java       |   24 +-
 .../TestQuotaObserverChoreRegionReports.java       |   25 +-
 .../TestQuotaObserverChoreWithMiniCluster.java     |   98 +-
 .../apache/hadoop/hbase/quotas/TestQuotaState.java |   17 +-
 .../hadoop/hbase/quotas/TestQuotaStatusRPCs.java   |   40 +-
 .../hadoop/hbase/quotas/TestQuotaTableUtil.java    |  106 +-
 .../hadoop/hbase/quotas/TestQuotaThrottle.java     |   15 +-
 .../hadoop/hbase/quotas/TestRateLimiter.java       |   22 +-
 .../quotas/TestRegionServerSpaceQuotaManager.java  |   54 +-
 .../hadoop/hbase/quotas/TestRegionSizeImpl.java    |   19 +-
 .../hbase/quotas/TestRegionSizeReportingChore.java |   39 +-
 .../hbase/quotas/TestRegionSizeStoreImpl.java      |   28 +-
 .../hadoop/hbase/quotas/TestRegionSizeUse.java     |   19 +-
 .../quotas/TestSnapshotQuotaObserverChore.java     |  136 +-
 .../quotas/TestSpaceQuotaBasicFunctioning.java     |   40 +-
 .../hbase/quotas/TestSpaceQuotaDropTable.java      |   13 +-
 .../hbase/quotas/TestSpaceQuotaIncrease.java       |   11 +-
 .../hbase/quotas/TestSpaceQuotaOnBulkLoad.java     |   28 +-
 .../quotas/TestSpaceQuotaOnNonExistingTables.java  |    9 +-
 .../hadoop/hbase/quotas/TestSpaceQuotaRemoval.java |   27 +-
 .../hbase/quotas/TestSpaceQuotaSwitchPolicies.java |   24 +-
 ...estSpaceQuotaViolationPolicyRefresherChore.java |  102 +-
 .../hadoop/hbase/quotas/TestSpaceQuotas.java       |  107 +-
 .../quotas/TestSpaceQuotasWithRegionReplicas.java  |   18 +-
 .../hbase/quotas/TestSpaceQuotasWithSnapshots.java |   84 +-
 .../quotas/TestSuperUserQuotaPermissions.java      |   32 +-
 .../hbase/quotas/TestTableQuotaViolationStore.java |   87 +-
 .../TestTableSpaceQuotaViolationNotifier.java      |   22 +-
 .../hadoop/hbase/quotas/TestTablesWithQuotas.java  |   31 +-
 .../hadoop/hbase/quotas/ThrottleQuotaTestUtil.java |   24 +-
 .../policies/BaseViolationPolicyEnforcement.java   |   15 +-
 ...BulkLoadCheckingViolationPolicyEnforcement.java |   16 +-
 ...TestDisableTableViolationPolicyEnforcement.java |    4 +-
 .../TestNoInsertsViolationPolicyEnforcement.java   |    4 +-
 ...ritesCompactionsViolationPolicyEnforcement.java |    6 +-
 .../TestNoWritesViolationPolicyEnforcement.java    |    4 +-
 .../AbstractTestDateTieredCompactionPolicy.java    |   18 +-
 .../hbase/regionserver/CreateRandomStoreFile.java  |  106 +-
 .../hbase/regionserver/DataBlockEncodingTool.java  |  334 ++-
 .../regionserver/DelegatingInternalScanner.java    |    3 +-
 .../regionserver/DelegatingKeyValueScanner.java    |    4 +-
 .../regionserver/EncodedSeekPerformanceTest.java   |   65 +-
 .../hbase/regionserver/KeyValueScanFixture.java    |   14 +-
 .../MetricsRegionServerWrapperStub.java            |    9 +-
 .../regionserver/MetricsRegionWrapperStub.java     |    1 -
 .../hadoop/hbase/regionserver/MockHStoreFile.java  |   41 +-
 .../hbase/regionserver/NoOpScanPolicyObserver.java |   10 +-
 .../hbase/regionserver/OOMERegionServer.java       |   18 +-
 .../hadoop/hbase/regionserver/RegionAsTable.java   |   94 +-
 .../hbase/regionserver/StatefulStoreMockMaker.java |   12 +-
 .../hbase/regionserver/TestAtomicOperation.java    |  147 +-
 .../hadoop/hbase/regionserver/TestBlocksRead.java  |   88 +-
 .../hbase/regionserver/TestBlocksScanned.java      |   54 +-
 .../regionserver/TestBootstrapNodeManager.java     |    2 +-
 .../regionserver/TestBrokenStoreFileCleaner.java   |   71 +-
 .../hadoop/hbase/regionserver/TestBulkLoad.java    |  115 +-
 .../regionserver/TestBulkLoadReplication.java      |  118 +-
 .../TestBulkLoadReplicationHFileRefs.java          |   66 +-
 .../hbase/regionserver/TestBulkloadBase.java       |   28 +-
 .../regionserver/TestCacheOnWriteInSchema.java     |   67 +-
 .../hadoop/hbase/regionserver/TestCellFlatSet.java |  135 +-
 .../hbase/regionserver/TestCellSkipListSet.java    |   27 +-
 .../TestCleanupCompactedFileAfterFailover.java     |   17 +-
 .../TestCleanupCompactedFileOnRegionClose.java     |   50 +-
 .../hbase/regionserver/TestCleanupMetaWAL.java     |   14 +-
 .../regionserver/TestClearRegionBlockCache.java    |   30 +-
 .../hadoop/hbase/regionserver/TestClusterId.java   |   26 +-
 .../hbase/regionserver/TestColumnSeeking.java      |   26 +-
 .../hbase/regionserver/TestCompactSplitThread.java |   12 +-
 .../hbase/regionserver/TestCompactingMemStore.java |  250 +-
 .../TestCompactingToCellFlatMapMemStore.java       |  361 ++-
 .../hadoop/hbase/regionserver/TestCompaction.java  |  144 +-
 .../regionserver/TestCompactionAfterBulkLoad.java  |   27 +-
 .../TestCompactionArchiveConcurrentClose.java      |   20 +-
 .../TestCompactionArchiveIOException.java          |   17 +-
 .../regionserver/TestCompactionFileNotFound.java   |   13 +-
 .../TestCompactionInDeadRegionServer.java          |   12 +-
 .../TestCompactionLifeCycleTracker.java            |   62 +-
 .../hbase/regionserver/TestCompactionPolicy.java   |   25 +-
 .../hbase/regionserver/TestCompactionState.java    |   64 +-
 .../regionserver/TestCompactionWithByteBuff.java   |   15 +-
 .../TestCompactionWithCoprocessor.java             |   12 +-
 .../hbase/regionserver/TestCompactorMemLeak.java   |    9 +-
 .../regionserver/TestCompoundBloomFilter.java      |  165 +-
 .../regionserver/TestDataBlockEncodingTool.java    |   37 +-
 .../TestDateTieredCompactionPolicy.java            |   36 +-
 ...TieredCompactionPolicyHeterogeneousStorage.java |   58 +-
 .../TestDateTieredCompactionPolicyOverflow.java    |    7 +-
 .../regionserver/TestDefaultCompactSelection.java  |   66 +-
 .../hbase/regionserver/TestDefaultMemStore.java    |  342 ++-
 .../hbase/regionserver/TestDefaultStoreEngine.java |   14 +-
 .../hbase/regionserver/TestDeleteMobTable.java     |   25 +-
 .../regionserver/TestDirectStoreSplitsMerges.java  |  120 +-
 .../hbase/regionserver/TestEncryptionDisabled.java |   15 +-
 .../regionserver/TestEncryptionKeyRotation.java    |   45 +-
 .../regionserver/TestEncryptionRandomKeying.java   |   23 +-
 .../regionserver/TestEndToEndSplitTransaction.java |   37 +-
 .../hbase/regionserver/TestFSErrorsExposed.java    |   87 +-
 .../regionserver/TestFailedAppendAndSync.java      |   51 +-
 .../regionserver/TestFlushLifeCycleTracker.java    |   46 +-
 .../hbase/regionserver/TestFlushRegionEntry.java   |    7 +-
 .../regionserver/TestGetClosestAtOrBefore.java     |   82 +-
 .../hadoop/hbase/regionserver/TestHMobStore.java   |  200 +-
 .../hadoop/hbase/regionserver/TestHRegion.java     | 1449 +++++-----
 .../hbase/regionserver/TestHRegionFileSystem.java  |   25 +-
 .../hadoop/hbase/regionserver/TestHRegionInfo.java |  210 +-
 .../hbase/regionserver/TestHRegionOnCluster.java   |   18 +-
 .../regionserver/TestHRegionReplayEvents.java      |  330 ++-
 .../regionserver/TestHRegionServerBulkLoad.java    |  117 +-
 .../TestHRegionServerBulkLoadWithOldClient.java    |   43 +-
 .../hbase/regionserver/TestHRegionTracing.java     |    6 +-
 .../regionserver/TestHRegionWithInMemoryFlush.java |   46 +-
 .../hadoop/hbase/regionserver/TestHStore.java      |  679 ++---
 .../hadoop/hbase/regionserver/TestHStoreFile.java  |   60 +-
 .../regionserver/TestHdfsSnapshotHRegion.java      |   40 +-
 .../hbase/regionserver/TestHeapMemoryManager.java  |  121 +-
 .../TestInputStreamBlockDistribution.java          |   26 +-
 .../hbase/regionserver/TestIsDeleteFailure.java    |   27 +-
 .../hbase/regionserver/TestJoinedScanners.java     |   45 +-
 .../hadoop/hbase/regionserver/TestKeepDeletes.java |  283 +-
 .../hbase/regionserver/TestKeyValueHeap.java       |    6 +-
 .../regionserver/TestKeyValueScanFixture.java      |   17 +-
 .../hadoop/hbase/regionserver/TestLogRoller.java   |   15 +-
 .../hbase/regionserver/TestMajorCompaction.java    |    8 +-
 .../TestMaxResultsPerColumnFamily.java             |   20 +-
 .../hbase/regionserver/TestMemStoreChunkPool.java  |   43 +-
 .../hbase/regionserver/TestMemStoreFlusher.java    |   15 +-
 .../hadoop/hbase/regionserver/TestMemStoreLAB.java |   69 +-
 .../regionserver/TestMemStoreSegmentsIterator.java |    9 +-
 .../regionserver/TestMemstoreLABWithoutPool.java   |   27 +-
 .../regionserver/TestMergesSplitsAddToTracker.java |   91 +-
 .../regionserver/TestMetricsHeapMemoryManager.java |    8 +-
 .../hbase/regionserver/TestMetricsRegion.java      |   41 +-
 .../regionserver/TestMetricsRegionServer.java      |   28 +-
 .../regionserver/TestMetricsTableAggregate.java    |    3 +-
 .../regionserver/TestMetricsTableLatencies.java    |   83 +-
 .../regionserver/TestMetricsUserAggregate.java     |   82 +-
 .../hadoop/hbase/regionserver/TestMinVersions.java |  212 +-
 .../TestMiniBatchOperationInProgress.java          |   14 +-
 .../hbase/regionserver/TestMinorCompaction.java    |   38 +-
 .../hbase/regionserver/TestMobStoreCompaction.java |   42 +-
 .../hbase/regionserver/TestMobStoreScanner.java    |   88 +-
 .../hbase/regionserver/TestMultiColumnScanner.java |   90 +-
 ...tiColumnScannerWithAlgoGZAndNoDataEncoding.java |    5 +-
 ...iColumnScannerWithAlgoGZAndUseDataEncoding.java |    5 +-
 ...ultiColumnScannerWithNoneAndNoDataEncoding.java |    5 +-
 ...ltiColumnScannerWithNoneAndUseDataEncoding.java |    5 +-
 .../hbase/regionserver/TestMultiLogThreshold.java  |    9 +-
 .../TestMultiVersionConcurrencyControl.java        |   13 +-
 .../TestMultiVersionConcurrencyControlBasic.java   |    6 +-
 .../hbase/regionserver/TestMutateRowsRecovery.java |    4 +-
 .../TestNewVersionBehaviorFromClientSide.java      |    6 +-
 ...estNotCleanupCompactedFileWhenRegionWarmup.java |   21 +-
 .../TestObservedExceptionsInBatch.java             |    4 +-
 .../TestOpenRegionFailedMemoryLeak.java            |    8 +-
 .../TestOpenSeqNumUnexpectedIncrease.java          |    6 +-
 .../hadoop/hbase/regionserver/TestParallelPut.java |   45 +-
 .../regionserver/TestPerColumnFamilyFlush.java     |   66 +-
 .../hadoop/hbase/regionserver/TestPriorityRpc.java |   62 +-
 .../hadoop/hbase/regionserver/TestQosFunction.java |   14 +-
 .../hbase/regionserver/TestRSChoresScheduled.java  |   15 +-
 .../regionserver/TestRSKilledWhenInitializing.java |   36 +-
 .../hbase/regionserver/TestRSRpcServices.java      |   10 +-
 .../hbase/regionserver/TestRSSnapshotVerifier.java |   27 +-
 .../TestReadAndWriteRegionInfoFile.java            |    2 +-
 .../hbase/regionserver/TestRecoveredEdits.java     |   72 +-
 .../TestRecoveredEditsReplayAndAbort.java          |   91 +-
 .../hbase/regionserver/TestRegionFavoredNodes.java |   49 +-
 .../hbase/regionserver/TestRegionIncrement.java    |   82 +-
 .../TestRegionInfoStaticInitialization.java        |   13 +-
 .../hbase/regionserver/TestRegionInterrupt.java    |   30 +-
 .../TestRegionMergeTransactionOnCluster.java       |  147 +-
 .../hadoop/hbase/regionserver/TestRegionMove.java  |   20 +-
 .../hadoop/hbase/regionserver/TestRegionOpen.java  |   17 +-
 .../regionserver/TestRegionReplicaFailover.java    |   48 +-
 .../TestRegionReplicaWaitForPrimaryFlushConf.java  |   12 +-
 .../hbase/regionserver/TestRegionReplicas.java     |   67 +-
 .../TestRegionReplicasAreDistributed.java          |   20 +-
 .../TestRegionReplicasWithModifyTable.java         |    2 +-
 .../TestRegionReplicasWithRestartScenarios.java    |   30 +-
 .../hbase/regionserver/TestRegionServerAbort.java  |   42 +-
 .../regionserver/TestRegionServerAbortTimeout.java |    9 +-
 .../regionserver/TestRegionServerAccounting.java   |    8 +-
 .../TestRegionServerCrashDisableWAL.java           |    2 +-
 .../regionserver/TestRegionServerHostname.java     |   59 +-
 .../regionserver/TestRegionServerMetrics.java      |   88 +-
 .../regionserver/TestRegionServerNoMaster.java     |   63 +-
 .../TestRegionServerOnlineConfigChange.java        |   99 +-
 .../TestRegionServerReadRequestMetrics.java        |   60 +-
 .../TestRegionServerRegionSpaceUseReport.java      |   26 +-
 .../TestRegionServerReportForDuty.java             |   36 +-
 .../hbase/regionserver/TestRegionServerScan.java   |   14 +-
 .../hbase/regionserver/TestRegionSplitPolicy.java  |    2 +-
 .../regionserver/TestRegionSplitRestriction.java   |   45 +-
 .../regionserver/TestRemoveRegionMetrics.java      |   29 +-
 .../regionserver/TestRequestsPerSecondMetric.java  |   39 +-
 .../hbase/regionserver/TestResettingCounters.java  |   39 +-
 .../hbase/regionserver/TestReversibleScanners.java |  255 +-
 .../regionserver/TestRowPrefixBloomFilter.java     |   69 +-
 .../hadoop/hbase/regionserver/TestRowTooBig.java   |   49 +-
 .../regionserver/TestRpcSchedulerFactory.java      |   11 +-
 .../regionserver/TestSCVFWithMiniCluster.java      |   13 +-
 .../hbase/regionserver/TestScanWithBloomError.java |   64 +-
 .../hadoop/hbase/regionserver/TestScanner.java     |  183 +-
 .../regionserver/TestScannerHeartbeatMessages.java |   59 +-
 .../regionserver/TestScannerRPCScanMetrics.java    |   24 +-
 .../regionserver/TestScannerRetriableFailure.java  |   15 +-
 .../regionserver/TestScannerWithBulkload.java      |   73 +-
 .../regionserver/TestScannerWithCorruptHFile.java  |    8 +-
 .../regionserver/TestSecureBulkLoadManager.java    |   93 +-
 .../regionserver/TestSecureBulkloadListener.java   |   39 +-
 .../hbase/regionserver/TestSeekOptimizations.java  |  177 +-
 .../hbase/regionserver/TestServerNonceManager.java |   20 +-
 .../TestSettingTimeoutOnBlockingPoint.java         |   14 +-
 .../hbase/regionserver/TestShortCircuitGet.java    |   25 +-
 .../regionserver/TestShutdownWhileWALBroken.java   |    6 +-
 .../regionserver/TestSimpleTimeRangeTracker.java   |    8 +-
 .../hbase/regionserver/TestSplitLogWorker.java     |  114 +-
 .../TestSplitTransactionOnCluster.java             |  261 +-
 .../hbase/regionserver/TestSplitWalDataLoss.java   |   22 +-
 .../regionserver/TestSplitWithBlockingFiles.java   |    9 +-
 .../hbase/regionserver/TestStoreFileInfo.java      |   24 +-
 .../regionserver/TestStoreFileRefresherChore.java  |   50 +-
 .../TestStoreFileScannerWithTagCompression.java    |   20 +-
 .../hbase/regionserver/TestStoreScanner.java       |  436 ++-
 .../regionserver/TestStoreScannerClosure.java      |   49 +-
 .../hbase/regionserver/TestStripeStoreEngine.java  |   15 +-
 .../regionserver/TestStripeStoreFileManager.java   |  173 +-
 .../hbase/regionserver/TestSwitchToStreamRead.java |   18 +-
 .../regionserver/TestSyncTimeRangeTracker.java     |   24 +-
 .../apache/hadoop/hbase/regionserver/TestTags.java |   39 +-
 .../regionserver/TestTimestampFilterSeekHint.java  |   27 +-
 .../hadoop/hbase/regionserver/TestWALLockup.java   |   41 +-
 .../TestWALMonotonicallyIncreasingSeqId.java       |   27 +-
 .../TestWalAndCompactingMemStoreFlush.java         |  318 +--
 .../hadoop/hbase/regionserver/TestWideScanner.java |    2 +-
 .../compactions/ConstantSizeFileListGenerator.java |    3 +-
 .../regionserver/compactions/EverythingPolicy.java |    7 +-
 .../compactions/ExplicitFileListGenerator.java     |   36 +-
 .../compactions/GaussianFileListGenerator.java     |    5 +-
 .../compactions/MockStoreFileGenerator.java        |   16 +-
 .../compactions/PerfTestCompactionPolicies.java    |   82 +-
 .../SemiConstantSizeFileListGenerator.java         |    2 +-
 .../compactions/SinusoidalFileListGenerator.java   |    4 +-
 .../compactions/SpikyFileListGenerator.java        |    4 +-
 .../compactions/StoreFileListGenerator.java        |    4 +-
 .../regionserver/compactions/TestCloseChecker.java |    5 +-
 .../compactions/TestCompactedHFilesDischarger.java |   22 +-
 .../regionserver/compactions/TestCompactor.java    |    5 +-
 .../compactions/TestCurrentHourProvider.java       |    2 +-
 .../compactions/TestDateTieredCompactor.java       |   20 +-
 .../compactions/TestFIFOCompactionPolicy.java      |   70 +-
 .../regionserver/compactions/TestOffPeakHours.java |   12 +-
 .../compactions/TestStripeCompactionPolicy.java    |  259 +-
 .../compactions/TestStripeCompactor.java           |   20 +-
 .../regionserver/http/TestRSStatusServlet.java     |   19 +-
 .../querymatcher/AbstractTestScanQueryMatcher.java |    2 +-
 .../TestCompactionScanQueryMatcher.java            |   14 +-
 .../querymatcher/TestExplicitColumnTracker.java    |   12 +-
 .../TestNewVersionBehaviorTracker.java             |   48 +-
 .../querymatcher/TestScanDeleteTracker.java        |   48 +-
 .../TestScanWildcardColumnTracker.java             |   16 +-
 .../querymatcher/TestUserScanQueryMatcher.java     |   73 +-
 .../storefiletracker/StoreFileTrackerForTest.java  |    2 +-
 .../TestChangeStoreFileTracker.java                |    2 +-
 .../TestMigrationStoreFileTracker.java             |    8 +-
 .../TestRegionWithFileBasedStoreFileTracker.java   |    2 +-
 .../storefiletracker/TestStoreFileListFile.java    |    2 +-
 .../TestStoreFileTrackerFactory.java               |    2 +-
 .../TestStoreFileTrackerValidationUtils.java       |    2 +-
 .../TestCompactionWithThroughputController.java    |   28 +-
 .../TestFlushWithThroughputController.java         |   32 +-
 .../throttle/TestStoreHotnessProtector.java        |   25 +-
 .../hbase/regionserver/wal/AbstractTestFSWAL.java  |   88 +-
 .../wal/AbstractTestLogRollPeriod.java             |   10 +-
 .../regionserver/wal/AbstractTestLogRolling.java   |   28 +-
 .../regionserver/wal/AbstractTestProtobufLog.java  |   34 +-
 .../regionserver/wal/AbstractTestWALReplay.java    |  311 +--
 .../regionserver/wal/FaultyProtobufLogReader.java  |   13 +-
 .../regionserver/wal/InstrumentedLogWriter.java    |   22 +-
 .../hbase/regionserver/wal/TestAsyncFSWAL.java     |   96 +-
 .../regionserver/wal/TestAsyncFSWALDurability.java |    2 +-
 .../regionserver/wal/TestAsyncFSWALRollStuck.java  |    2 +-
 .../regionserver/wal/TestAsyncLogRollPeriod.java   |    4 +-
 .../regionserver/wal/TestAsyncLogRolling.java      |    4 +-
 .../regionserver/wal/TestAsyncProtobufLog.java     |    5 +-
 .../hbase/regionserver/wal/TestAsyncWALReplay.java |    6 +-
 .../wal/TestAsyncWALReplayCompressed.java          |    4 +-
 .../wal/TestAsyncWALReplayValueCompression.java    |    4 +-
 .../hbase/regionserver/wal/TestCompressor.java     |   32 +-
 .../regionserver/wal/TestCustomWALCellCodec.java   |    9 +-
 .../hbase/regionserver/wal/TestDurability.java     |   29 +-
 .../hadoop/hbase/regionserver/wal/TestFSHLog.java  |   81 +-
 .../regionserver/wal/TestFSHLogDurability.java     |    4 +-
 .../hbase/regionserver/wal/TestFSWALEntry.java     |    5 +-
 .../hbase/regionserver/wal/TestHBaseWalOnEC.java   |    1 -
 .../hbase/regionserver/wal/TestLogRollAbort.java   |   38 +-
 .../hbase/regionserver/wal/TestLogRollPeriod.java  |    4 +-
 .../hbase/regionserver/wal/TestLogRolling.java     |   47 +-
 .../regionserver/wal/TestLogRollingNoCluster.java  |   38 +-
 .../hbase/regionserver/wal/TestMetricsWAL.java     |    8 +-
 .../hbase/regionserver/wal/TestProtobufLog.java    |    4 +-
 .../regionserver/wal/TestSecureAsyncWALReplay.java |    4 +-
 .../regionserver/wal/TestSecureWALReplay.java      |    4 +-
 .../regionserver/wal/TestSequenceIdAccounting.java |   16 +-
 .../hbase/regionserver/wal/TestSyncFuture.java     |    4 +-
 .../regionserver/wal/TestSyncFutureCache.java      |    7 +-
 .../regionserver/wal/TestWALActionsListener.java   |   21 +-
 .../wal/TestWALCellCodecWithCompression.java       |   58 +-
 .../regionserver/wal/TestWALConfiguration.java     |   29 +-
 .../hbase/regionserver/wal/TestWALOpenError.java   |   20 +-
 .../hbase/regionserver/wal/TestWALReplay.java      |    4 +-
 .../wal/TestWALReplayBoundedLogWriterCreation.java |    5 +-
 .../regionserver/wal/TestWALReplayCompressed.java  |    4 +-
 .../wal/TestWALReplayValueCompression.java         |    4 +-
 .../regionserver/wal/WALDurabilityTestBase.java    |    8 +-
 .../replication/DummyReplicationEndpoint.java      |    2 +-
 .../hbase/replication/ReplicationSourceDummy.java  |   12 +-
 .../replication/SerialReplicationTestBase.java     |    9 +-
 .../TestAddToSerialReplicationPeer.java            |    6 +-
 .../replication/TestClaimReplicationQueue.java     |    6 +-
 .../hbase/replication/TestMasterReplication.java   |  187 +-
 .../replication/TestMultiSlaveReplication.java     |   52 +-
 .../replication/TestNamespaceReplication.java      |   34 +-
 ...TestNamespaceReplicationWithBulkLoadedData.java |   97 +-
 .../TestNonHBaseReplicationEndpoint.java           |   16 +-
 .../replication/TestPerTableCFReplication.java     |   85 +-
 .../TestRemoveFromSerialReplicationPeer.java       |    2 +-
 .../hbase/replication/TestReplicationBase.java     |   28 +-
 .../TestReplicationChangingPeerRegionservers.java  |   15 +-
 .../TestReplicationDisableInactivePeer.java        |   17 +-
 .../replication/TestReplicationDroppedTables.java  |   20 +-
 ...ReplicationEditsDroppedWithDeletedTableCFs.java |   28 +-
 ...estReplicationEditsDroppedWithDroppedTable.java |   28 +-
 .../TestReplicationEmptyWALRecovery.java           |   15 +-
 .../hbase/replication/TestReplicationEndpoint.java |   94 +-
 .../replication/TestReplicationKillMasterRS.java   |    2 +-
 .../TestReplicationKillMasterRSCompressed.java     |    8 +-
 ...ReplicationKillMasterRSWithSeparateOldWALs.java |    2 +-
 .../hbase/replication/TestReplicationKillRS.java   |    6 +-
 .../replication/TestReplicationKillSlaveRS.java    |    2 +-
 ...tReplicationKillSlaveRSWithSeparateOldWALs.java |    3 +-
 .../replication/TestReplicationMetricsforUI.java   |   11 +-
 .../replication/TestReplicationProcedureRetry.java |   11 +-
 .../replication/TestReplicationSmallTests.java     |   18 +-
 .../hbase/replication/TestReplicationStatus.java   |   25 +-
 .../TestReplicationStatusAfterLagging.java         |    2 +-
 ...licationStatusBothNormalAndRecoveryLagging.java |    2 +-
 .../replication/TestReplicationStatusSink.java     |   13 +-
 ...ationStatusSourceStartedTargetStoppedNewOp.java |    2 +-
 ...ationStatusSourceStartedTargetStoppedNoOps.java |    2 +-
 ...atusSourceStartedTargetStoppedWithRecovery.java |    4 +-
 .../TestReplicationStuckWithDeletedTableCFs.java   |   27 +-
 .../TestReplicationStuckWithDroppedTable.java      |   26 +-
 .../replication/TestReplicationSyncUpTool.java     |   12 +-
 .../replication/TestReplicationSyncUpToolBase.java |    2 +-
 .../TestReplicationWALEntryFilters.java            |   61 +-
 .../hbase/replication/TestReplicationWithTags.java |   29 +-
 .../hbase/replication/TestSerialReplication.java   |   14 +-
 .../replication/TestSerialReplicationFailover.java |    2 +-
 .../TestVerifyCellsReplicationEndpoint.java        |    2 +-
 .../replication/master/TestTableCFsUpdater.java    |    8 +-
 ...estReplicationEndpointWithMultipleAsyncWAL.java |    4 +-
 .../TestReplicationEndpointWithMultipleWAL.java    |    4 +-
 ...KillMasterRSCompressedWithMultipleAsyncWAL.java |   10 +-
 ...ationKillMasterRSCompressedWithMultipleWAL.java |   10 +-
 ...tReplicationSyncUpToolWithMultipleAsyncWAL.java |    4 +-
 .../TestReplicationSyncUpToolWithMultipleWAL.java  |    2 +-
 .../regionserver/TestBasicWALEntryStream.java      |   12 +-
 .../TestBasicWALEntryStreamAsyncFSWAL.java         |    2 +-
 .../TestBasicWALEntryStreamFSHLog.java             |    2 +-
 .../regionserver/TestDumpReplicationQueues.java    |   36 +-
 .../TestGlobalReplicationThrottler.java            |   26 +-
 ...InterClusterReplicationEndpointFilterEdits.java |   37 +-
 .../TestMetaRegionReplicaReplicationEndpoint.java  |   60 +-
 .../TestRaceWhenCreatingReplicationSource.java     |    2 +-
 .../TestRefreshPeerWhileRegionServerRestarts.java  |    6 +-
 .../TestRefreshRecoveredReplication.java           |   26 +-
 .../TestRegionReplicaReplicationEndpoint.java      |  101 +-
 ...stRegionReplicaReplicationEndpointNoMaster.java |   58 +-
 .../regionserver/TestReplicationCompressedWAL.java |    5 +-
 .../regionserver/TestReplicationSink.java          |  104 +-
 .../regionserver/TestReplicationSinkManager.java   |   24 +-
 .../regionserver/TestReplicationSource.java        |  187 +-
 .../TestReplicationSourceLogQueue.java             |    9 +-
 .../regionserver/TestReplicationSourceManager.java |  146 +-
 .../TestReplicationSourceManagerJoin.java          |    8 +-
 .../TestReplicationSourceManagerZkImpl.java        |    8 +-
 .../regionserver/TestReplicationThrottler.java     |   38 +-
 .../TestReplicationValueCompressedWAL.java         |    4 +-
 .../replication/regionserver/TestReplicator.java   |   16 +-
 .../regionserver/TestSerialReplicationChecker.java |    4 +-
 .../TestSerialReplicationEndpoint.java             |   27 +-
 .../TestSourceFSConfigurationProvider.java         |   26 +-
 .../regionserver/TestWALEntrySinkFilter.java       |  120 +-
 .../TestWALEntryStreamDifferentCounts.java         |    2 +-
 ...estWALEntryStreamDifferentCountsAsyncFSWAL.java |    5 +-
 .../TestWALEntryStreamDifferentCountsFSHLog.java   |    2 +-
 .../regionserver/WALEntryStreamTestBase.java       |    2 +-
 ...adoopSecurityEnabledUserProviderForTesting.java |    4 +-
 .../hadoop/hbase/security/TestSecureIPC.java       |   81 +-
 .../org/apache/hadoop/hbase/security/TestUser.java |   74 +-
 .../TestUsersOperationsWithSecureHadoop.java       |   12 +-
 .../hbase/security/access/SecureTestUtil.java      |  318 +--
 .../security/access/TestAccessControlFilter.java   |   19 +-
 .../security/access/TestAccessController.java      |  704 +++--
 .../security/access/TestAccessController2.java     |  110 +-
 .../security/access/TestAccessController3.java     |   74 +-
 .../access/TestCellACLWithMultipleVersions.java    |  168 +-
 .../hadoop/hbase/security/access/TestCellACLs.java |   83 +-
 .../TestCoprocessorWhitelistMasterObserver.java    |  157 +-
 .../hbase/security/access/TestHDFSAclHelper.java   |   63 +-
 .../security/access/TestNamespaceCommands.java     |  129 +-
 .../security/access/TestPermissionBuilder.java     |   18 +-
 .../hbase/security/access/TestRpcAccessChecks.java |  105 +-
 .../security/access/TestScanEarlyTermination.java  |   23 +-
 .../TestSnapshotScannerHDFSAclController.java      |   34 +-
 .../TestSnapshotScannerHDFSAclController2.java     |   31 +-
 .../security/access/TestTablePermissions.java      |  159 +-
 .../access/TestUnloadAccessController.java         |   12 +-
 .../access/TestWithDisabledAuthorization.java      |  193 +-
 .../security/access/TestZKPermissionWatcher.java   |   21 +-
 .../CustomSaslAuthenticationProviderTestBase.java  |   12 +-
 ...omSaslAuthenticationProviderNettyRpcServer.java |    2 +-
 ...mSaslAuthenticationProviderSimpleRpcServer.java |    2 +-
 .../TestSaslServerAuthenticationProviders.java     |   41 +-
 .../hbase/security/token/SecureTestCluster.java    |   29 +-
 .../security/token/TestAuthenticationKey.java      |    6 +-
 .../token/TestDelegationTokenWithEncryption.java   |    8 +-
 .../security/token/TestFsDelegationToken.java      |   37 +-
 .../token/TestGenerateDelegationToken.java         |   11 +-
 .../security/token/TestTokenAuthentication.java    |  186 +-
 .../hbase/security/token/TestZKSecretWatcher.java  |   65 +-
 .../token/TestZKSecretWatcherRefreshKeys.java      |   21 +-
 .../ExpAsStringVisibilityLabelServiceImpl.java     |   85 +-
 .../LabelFilteringScanLabelGenerator.java          |    5 +-
 .../LoadTestDataGeneratorWithVisibilityLabels.java |   42 +-
 .../TestDefaultScanLabelGeneratorStack.java        |   22 +-
 .../TestEnforcingScanLabelGenerator.java           |   16 +-
 .../visibility/TestExpressionExpander.java         |   83 +-
 .../security/visibility/TestExpressionParser.java  |   30 +-
 ...tVisibilityLabelReplicationWithExpAsString.java |   44 +-
 .../security/visibility/TestVisibilityLabels.java  |  175 +-
 ...tVisibilityLabelsOnNewVersionBehaviorTable.java |   15 +-
 ...tVisibilityLabelsOpWithDifferentUsersNoACL.java |  104 +-
 .../TestVisibilityLabelsReplication.java           |  123 +-
 .../visibility/TestVisibilityLabelsWithACL.java    |  123 +-
 ...estVisibilityLabelsWithCustomVisLabService.java |   13 +-
 ...VisibilityLabelsWithDefaultVisLabelService.java |  199 +-
 .../TestVisibilityLabelsWithDeletes.java           |   90 +-
 .../TestVisibilityLabelsWithSLGStack.java          |   30 +-
 .../visibility/TestVisibilityLablesWithGroups.java |   33 +-
 .../visibility/TestVisibilityWithCheckAuths.java   |   79 +-
 .../visibility/TestWithDisabledAuthorization.java  |   39 +-
 .../VisibilityLabelsWithDeletesTestBase.java       |    4 +-
 .../security/visibility/VisibilityTestUtil.java    |   26 +-
 .../hbase/snapshot/MobSnapshotTestingUtils.java    |   13 +-
 .../hbase/snapshot/SnapshotTestingUtils.java       |  355 ++-
 .../TestConcurrentFlushSnapshotFromClient.java     |    4 +-
 .../snapshot/TestFlushSnapshotFromClient.java      |   64 +-
 .../snapshot/TestMobFlushSnapshotFromClient.java   |   15 +-
 .../TestMobRestoreFlushSnapshotFromClient.java     |   15 +-
 .../snapshot/TestMobRestoreSnapshotHelper.java     |    6 +-
 .../hbase/snapshot/TestRegionSnapshotTask.java     |   55 +-
 .../TestRestoreFlushSnapshotFromClient.java        |   43 +-
 .../hbase/snapshot/TestRestoreSnapshotHelper.java  |   39 +-
 .../hbase/snapshot/TestSnapshotClientRetries.java  |   27 +-
 .../snapshot/TestSnapshotDescriptionUtils.java     |  113 +-
 .../hbase/snapshot/TestSnapshotManifest.java       |   33 +-
 .../hbase/snapshot/TestSnapshotStoreFileSize.java  |   17 +-
 .../snapshot/TestSnapshotWhenChoreCleaning.java    |   13 +-
 .../hadoop/hbase/tool/MapreduceTestingShim.java    |   34 +-
 .../hadoop/hbase/tool/TestCanaryStatusServlet.java |   21 +-
 .../apache/hadoop/hbase/tool/TestCanaryTool.java   |    6 +-
 .../hbase/tool/TestLoadIncrementalHFiles.java      |  124 +-
 .../TestLoadIncrementalHFilesSplitRecovery.java    |  127 +-
 .../tool/TestSecureLoadIncrementalHFiles.java      |    4 +-
 ...stSecureLoadIncrementalHFilesSplitRecovery.java |    6 +-
 .../tool/coprocessor/CoprocessorValidatorTest.java |   52 +-
 .../hadoop/hbase/trace/OpenTelemetryClassRule.java |   77 +-
 .../hadoop/hbase/trace/OpenTelemetryTestRule.java  |    4 +-
 .../hadoop/hbase/util/BaseTestHBaseFsck.java       |  181 +-
 .../hadoop/hbase/util/ConstantDelayQueue.java      |    7 +-
 .../apache/hadoop/hbase/util/HBaseHomePath.java    |   34 +-
 .../hadoop/hbase/util/HFileArchiveTestingUtil.java |   44 +-
 .../apache/hadoop/hbase/util/HFileTestUtil.java    |  104 +-
 .../hadoop/hbase/util/LauncherSecurityManager.java |   19 +-
 .../hbase/util/LoadTestDataGeneratorWithMOB.java   |   28 +-
 .../hbase/util/LoadTestDataGeneratorWithTags.java  |   44 +-
 .../org/apache/hadoop/hbase/util/MockServer.java   |   12 +-
 .../hadoop/hbase/util/MultiThreadedAction.java     |  220 +-
 .../hadoop/hbase/util/MultiThreadedReader.java     |  109 +-
 .../hbase/util/MultiThreadedReaderWithACL.java     |   41 +-
 .../hadoop/hbase/util/MultiThreadedUpdater.java    |  111 +-
 .../hbase/util/MultiThreadedUpdaterWithACL.java    |   39 +-
 .../hadoop/hbase/util/MultiThreadedWriter.java     |   22 +-
 .../hadoop/hbase/util/MultiThreadedWriterBase.java |   35 +-
 .../hbase/util/MultiThreadedWriterWithACL.java     |   17 +-
 .../hbase/util/ProcessBasedLocalHBaseCluster.java  |  115 +-
 .../apache/hadoop/hbase/util/RestartMetaTest.java  |   66 +-
 .../hadoop/hbase/util/StoppableImplementation.java |    5 +-
 .../hadoop/hbase/util/TestBloomFilterChunk.java    |   93 +-
 .../util/TestBoundedPriorityBlockingQueue.java     |   13 +-
 .../hadoop/hbase/util/TestByteBuffUtils.java       |    4 +-
 .../hadoop/hbase/util/TestCompressionTest.java     |   40 +-
 .../hadoop/hbase/util/TestConfigurationUtil.java   |    4 +-
 .../hadoop/hbase/util/TestConnectionCache.java     |    2 +-
 .../hbase/util/TestCoprocessorScanPolicy.java      |   28 +-
 .../hbase/util/TestDefaultEnvironmentEdge.java     |   12 +-
 .../hadoop/hbase/util/TestEncryptionTest.java      |   27 +-
 .../hadoop/hbase/util/TestFSTableDescriptors.java  |   22 +-
 .../org/apache/hadoop/hbase/util/TestFSUtils.java  |  146 +-
 .../apache/hadoop/hbase/util/TestFSVisitor.java    |   22 +-
 .../hbase/util/TestFromClientSide3WoUnsafe.java    |    6 +-
 .../TestHBaseFsckCleanReplicationBarriers.java     |   53 +-
 .../hadoop/hbase/util/TestHBaseFsckComparator.java |   16 +-
 .../hadoop/hbase/util/TestHBaseFsckEncryption.java |   22 +-
 .../apache/hadoop/hbase/util/TestHBaseFsckMOB.java |   16 +-
 .../hbase/util/TestHBaseFsckReplication.java       |    8 +-
 .../hadoop/hbase/util/TestHFileArchiveUtil.java    |   14 +-
 .../org/apache/hadoop/hbase/util/TestIdLock.java   |   12 +-
 .../hadoop/hbase/util/TestIdReadWriteLock.java     |   34 +-
 .../util/TestIncrementingEnvironmentEdge.java      |    9 +-
 .../hadoop/hbase/util/TestJSONMetricUtil.java      |    2 +-
 .../hadoop/hbase/util/TestLossyCounting.java       |   15 +-
 .../hbase/util/TestMiniClusterLoadEncoded.java     |   17 +-
 .../hbase/util/TestMiniClusterLoadParallel.java    |   16 +-
 .../hbase/util/TestMiniClusterLoadSequential.java  |   50 +-
 .../apache/hadoop/hbase/util/TestRegionMover1.java |   55 +-
 .../apache/hadoop/hbase/util/TestRegionMover2.java |   23 +-
 .../apache/hadoop/hbase/util/TestRegionMover3.java |   18 +-
 .../hbase/util/TestRegionSplitCalculator.java      |   56 +-
 .../hadoop/hbase/util/TestRegionSplitter.java      |  590 +++--
 .../org/apache/hadoop/hbase/util/TestRootPath.java |    7 +-
 .../apache/hadoop/hbase/util/TestSortedList.java   |   26 +-
 .../hadoop/hbase/util/TestStealJobQueue.java       |   43 +-
 .../compaction/TestMajorCompactionRequest.java     |   44 +-
 .../compaction/TestMajorCompactionTTLRequest.java  |   13 +-
 .../hbase/util/compaction/TestMajorCompactor.java  |   25 +-
 .../util/compaction/TestMajorCompactorTTL.java     |   11 +-
 .../hadoop/hbase/util/hbck/HbckTestingUtil.java    |   30 +-
 .../hbase/util/test/LoadTestDataGenerator.java     |   89 +-
 .../util/test/LoadTestDataGeneratorWithACL.java    |   41 +-
 .../hadoop/hbase/wal/CompressedWALTestBase.java    |   41 +-
 .../org/apache/hadoop/hbase/wal/FaultyFSLog.java   |   14 +-
 .../apache/hadoop/hbase/wal/FileSystemProxy.java   |   17 +-
 .../apache/hadoop/hbase/wal/IOTestProvider.java    |   81 +-
 ...syncFSWALCorruptionDueToDanglingByteBuffer.java |    2 +-
 .../wal/TestBoundedRegionGroupingStrategy.java     |   30 +-
 .../apache/hadoop/hbase/wal/TestCompressedWAL.java |    7 +-
 .../wal/TestCompressedWALValueCompression.java     |   15 +-
 .../apache/hadoop/hbase/wal/TestDisabledWAL.java   |    6 +-
 ...estFSHLogCorruptionDueToDanglingByteBuffer.java |    2 +-
 ...ruptionWithMultiPutDueToDanglingByteBuffer.java |    8 +-
 .../hadoop/hbase/wal/TestFSHLogProvider.java       |   89 +-
 .../hadoop/hbase/wal/TestOutputSinkWriter.java     |   50 +-
 .../hbase/wal/TestRaceBetweenGetWALAndGetWALs.java |    2 +-
 .../hadoop/hbase/wal/TestReadWriteSeqIdFiles.java  |    2 +-
 .../org/apache/hadoop/hbase/wal/TestSecureWAL.java |   10 +-
 .../apache/hadoop/hbase/wal/TestWALFactory.java    |  218 +-
 .../apache/hadoop/hbase/wal/TestWALFiltering.java  |   37 +-
 .../apache/hadoop/hbase/wal/TestWALMethods.java    |   61 +-
 .../hbase/wal/TestWALOpenAfterDNRollingStart.java  |    9 +-
 .../apache/hadoop/hbase/wal/TestWALProvider.java   |   27 +-
 .../hadoop/hbase/wal/TestWALReaderOnSecureWAL.java |   22 +-
 .../apache/hadoop/hbase/wal/TestWALRootDir.java    |   47 +-
 .../org/apache/hadoop/hbase/wal/TestWALSplit.java  |  382 ++-
 .../wal/TestWALSplitBoundedLogWriterCreation.java  |    7 +-
 .../hadoop/hbase/wal/TestWALSplitCompressed.java   |    6 +-
 .../hadoop/hbase/wal/TestWALSplitToHFile.java      |   66 +-
 .../hbase/wal/TestWALSplitValueCompression.java    |   12 +-
 .../wal/TestWALSplitWithDeletedTableData.java      |   17 +-
 .../hadoop/hbase/wal/TestWrongMetaWALFileName.java |    2 +-
 ...LCorruptionDueToDanglingByteBufferTestBase.java |    2 +-
 ...ithMultiPutDueToDanglingByteBufferTestBase.java |   11 +-
 .../hadoop/hbase/wal/WALPerformanceEvaluation.java |  126 +-
 .../hadoop/hbase/zookeeper/TestZooKeeperACL.java   |  108 +-
 hbase-server/src/test/resources/mapred-site.xml    |    1 -
 hbase-shaded/hbase-shaded-check-invariants/pom.xml |   26 +-
 .../hbase-shaded-client-byo-hadoop/pom.xml         |  302 +--
 hbase-shaded/hbase-shaded-client/pom.xml           |   26 +-
 hbase-shaded/hbase-shaded-mapreduce/pom.xml        |  722 ++---
 .../hbase-shaded-testing-util-tester/pom.xml       |    7 +-
 .../shaded/TestShadedHBaseTestingUtility.java      |    5 +-
 hbase-shaded/hbase-shaded-testing-util/pom.xml     |   19 +-
 .../shaded/org/eclipse/jetty/webapp/webdefault.xml |    1 -
 .../pom.xml                                        |   26 +-
 hbase-shaded/pom.xml                               |  130 +-
 hbase-shell/pom.xml                                |  121 +-
 .../hadoop/hbase/client/AbstractTestShell.java     |    3 +-
 .../apache/hadoop/hbase/client/TestAdminShell.java |    5 +-
 .../hadoop/hbase/client/TestAdminShell2.java       |    5 +-
 .../hadoop/hbase/client/TestChangeSftShell.java    |    2 +-
 .../hadoop/hbase/client/TestQuotasShell.java       |    5 +-
 .../hadoop/hbase/client/TestRSGroupShell.java      |    9 +-
 .../hadoop/hbase/client/TestReplicationShell.java  |    7 +-
 .../org/apache/hadoop/hbase/client/TestShell.java  |    9 +-
 .../hadoop/hbase/client/TestShellNoCluster.java    |    5 +-
 .../apache/hadoop/hbase/client/TestTableShell.java |    5 +-
 .../hbase/client/procedure/ShellTestProcedure.java |   13 +-
 hbase-testing-util/pom.xml                         |   26 +-
 .../hadoop/hbase/testing/TestingHBaseCluster.java  |    2 +-
 .../hbase/testing/TestingHBaseClusterImpl.java     |    2 +-
 .../hbase/testing/TestingHBaseClusterOption.java   |   10 +-
 .../hadoop/hbase/TestHBaseTestingUtilSpinup.java   |    8 +-
 .../hbase/testing/TestTestingHBaseCluster.java     |    2 +-
 .../testing/TestTestingHBaseClusterImplForCPs.java |    2 +-
 hbase-thrift/pom.xml                               |  257 +-
 .../org/apache/hadoop/hbase/thrift/CallQueue.java  |   22 +-
 .../org/apache/hadoop/hbase/thrift/Constants.java  |   61 +-
 .../hadoop/hbase/thrift/HBaseServiceHandler.java   |   19 +-
 .../hbase/thrift/HThreadedSelectorServerArgs.java  |   71 +-
 .../hbase/thrift/HbaseHandlerMetricsProxy.java     |   42 +-
 .../hbase/thrift/HttpAuthenticationException.java  |   18 +-
 .../org/apache/hadoop/hbase/thrift/ImplType.java   |   13 +-
 .../hadoop/hbase/thrift/IncrementCoalescer.java    |   41 +-
 .../hbase/thrift/IncrementCoalescerMBean.java      |    1 -
 .../hbase/thrift/TBoundedThreadPoolServer.java     |  114 +-
 .../hbase/thrift/THBaseThreadPoolExecutor.java     |   13 +-
 .../hbase/thrift/ThriftHBaseServiceHandler.java    |  469 ++--
 .../hadoop/hbase/thrift/ThriftHttpServlet.java     |   64 +-
 .../apache/hadoop/hbase/thrift/ThriftMetrics.java  |   54 +-
 .../apache/hadoop/hbase/thrift/ThriftServer.java   |  339 ++-
 .../hadoop/hbase/thrift/ThriftUtilities.java       |  121 +-
 .../hbase/thrift2/ThriftHBaseServiceHandler.java   |  118 +-
 .../apache/hadoop/hbase/thrift2/ThriftServer.java  |   23 +-
 .../hadoop/hbase/thrift2/ThriftUtilities.java      |  622 ++---
 .../hadoop/hbase/thrift2/client/ThriftAdmin.java   |  125 +-
 .../hbase/thrift2/client/ThriftClientBuilder.java  |    4 +-
 .../hbase/thrift2/client/ThriftConnection.java     |   45 +-
 .../hadoop/hbase/thrift2/client/ThriftTable.java   |   88 +-
 .../hbase/thrift/ErrorThrowingGetObserver.java     |    6 +-
 .../hbase/thrift/HBaseThriftTestingUtility.java    |    9 +-
 .../hbase/thrift/TestBindExceptionHandling.java    |   12 +-
 .../apache/hadoop/hbase/thrift/TestCallQueue.java  |   24 +-
 .../hadoop/hbase/thrift/TestThriftHttpServer.java  |   31 +-
 .../hadoop/hbase/thrift/TestThriftServer.java      |  303 +--
 .../hbase/thrift/TestThriftServerCmdLine.java      |   76 +-
 .../thrift/TestThriftSpnegoHttpFallbackServer.java |   58 +-
 .../hbase/thrift/TestThriftSpnegoHttpServer.java   |   62 +-
 .../hadoop/hbase/thrift/ThriftServerRunner.java    |   18 +-
 .../hbase/thrift2/TestThrift2HttpServer.java       |   11 +-
 .../hbase/thrift2/TestThrift2ServerCmdLine.java    |   14 +-
 .../hadoop/hbase/thrift2/TestThriftConnection.java |  134 +-
 .../thrift2/TestThriftHBaseServiceHandler.java     |  305 +--
 .../TestThriftHBaseServiceHandlerWithLabels.java   |  118 +-
 .../TestThriftHBaseServiceHandlerWithReadOnly.java |   44 +-
 hbase-zookeeper/pom.xml                            |  164 +-
 .../hbase/zookeeper/ClusterStatusTracker.java      |   46 +-
 .../hadoop/hbase/zookeeper/DeletionListener.java   |   18 +-
 .../hadoop/hbase/zookeeper/EmptyWatcher.java       |    7 +-
 .../apache/hadoop/hbase/zookeeper/HQuorumPeer.java |   56 +-
 .../hadoop/hbase/zookeeper/InstancePending.java    |   15 +-
 .../hbase/zookeeper/LoadBalancerTracker.java       |   15 +-
 .../hbase/zookeeper/MasterAddressTracker.java      |  122 +-
 .../zookeeper/MasterMaintenanceModeTracker.java    |   15 +-
 .../hadoop/hbase/zookeeper/MetaTableLocator.java   |  110 +-
 .../hbase/zookeeper/MiniZooKeeperCluster.java      |   72 +-
 .../hadoop/hbase/zookeeper/PendingWatcher.java     |   21 +-
 .../hbase/zookeeper/RecoverableZooKeeper.java      |  208 +-
 .../hbase/zookeeper/RegionNormalizerTracker.java   |   15 +-
 .../hbase/zookeeper/SnapshotCleanupTracker.java    |   46 +-
 .../apache/hadoop/hbase/zookeeper/ZKAclReset.java  |   25 +-
 .../hadoop/hbase/zookeeper/ZKAuthentication.java   |  116 +-
 .../apache/hadoop/hbase/zookeeper/ZKClusterId.java |   21 +-
 .../org/apache/hadoop/hbase/zookeeper/ZKDump.java  |   46 +-
 .../hadoop/hbase/zookeeper/ZKLeaderManager.java    |   45 +-
 .../apache/hadoop/hbase/zookeeper/ZKListener.java  |   13 +-
 .../hadoop/hbase/zookeeper/ZKMainServer.java       |   19 +-
 .../hadoop/hbase/zookeeper/ZKNodeTracker.java      |   86 +-
 .../hadoop/hbase/zookeeper/ZKServerTool.java       |    9 +-
 .../apache/hadoop/hbase/zookeeper/ZKSplitLog.java  |   25 +-
 .../org/apache/hadoop/hbase/zookeeper/ZKUtil.java  |  871 +++---
 .../apache/hadoop/hbase/zookeeper/ZKWatcher.java   |  177 +-
 .../apache/hadoop/hbase/HBaseZKTestingUtility.java |    7 +-
 .../hadoop/hbase/zookeeper/TestHQuorumPeer.java    |   25 +-
 .../hbase/zookeeper/TestInstancePending.java       |    4 +-
 .../hbase/zookeeper/TestMasterAddressTracker.java  |    4 +-
 .../hbase/zookeeper/TestReadOnlyZKClient.java      |    6 +-
 .../hbase/zookeeper/TestRecoverableZooKeeper.java  |   14 +-
 .../hbase/zookeeper/TestZKLeaderManager.java       |   43 +-
 .../hadoop/hbase/zookeeper/TestZKMainServer.java   |   11 +-
 .../apache/hadoop/hbase/zookeeper/TestZKMulti.java |   66 +-
 .../hadoop/hbase/zookeeper/TestZKNodeTracker.java  |   38 +-
 .../apache/hadoop/hbase/zookeeper/TestZKUtil.java  |   13 +-
 .../hadoop/hbase/zookeeper/TestZKUtilNoServer.java |    8 +-
 pom.xml                                            |   46 +-
 4603 files changed, 120656 insertions(+), 144026 deletions(-)


[hbase] 01/02: HBASE-26899 tweak pom and formatter

Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 731da45b911724a637ac0015a4b8fdaddef26ff2
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Tue Apr 26 21:40:08 2022 +0800

    HBASE-26899 tweak pom and formatter
    
    Signed-off-by: Andrew Purtell <ap...@apache.org>
    Signed-off-by: Nick Dimiduk <nd...@apache.org>
    (cherry picked from commit 0edecbf9e00fa33ff163af2b7098873e0c84a34e)
---
 dev-support/hbase_eclipse_formatter.xml | 690 ++++++++++++++++++--------------
 pom.xml                                 |  46 ++-
 2 files changed, 439 insertions(+), 297 deletions(-)

diff --git a/dev-support/hbase_eclipse_formatter.xml b/dev-support/hbase_eclipse_formatter.xml
index 6dec653ad62..99000a62e21 100644
--- a/dev-support/hbase_eclipse_formatter.xml
+++ b/dev-support/hbase_eclipse_formatter.xml
@@ -18,297 +18,401 @@
  * limitations under the License.
  */
 -->
-<profiles version="12">
-<profile kind="CodeFormatterProfile" name="'HBase Apache Current'" version="12">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="20"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-</profile>
+<profiles version="22">
+    <profile kind="CodeFormatterProfile" name="'HBase Apache Current'" version="22">
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="52"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="separate_lines_if_wrapped"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="52"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+    </profile>
 </profiles>
diff --git a/pom.xml b/pom.xml
index 8baa8c1f99f..3d748b2acd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -628,7 +628,8 @@
     <surefire.version>3.0.0-M6</surefire.version>
     <wagon.ssh.version>2.12</wagon.ssh.version>
     <xml.maven.version>1.0.1</xml.maven.version>
-    <spotless.version>2.21.0</spotless.version>
+    <spotless.version>2.22.2</spotless.version>
+    <maven-site.version>3.11.0</maven-site.version>
     <!-- compression -->
     <aircompressor.version>0.21</aircompressor.version>
     <brotli4j.version>1.7.1</brotli4j.version>
@@ -2283,6 +2284,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
+        <version>${maven-site.version}</version>
         <configuration>
           <siteDirectory>${basedir}/src/site</siteDirectory>
           <customBundle>${basedir}/src/site/custom/project-info-report.properties</customBundle>
@@ -2374,10 +2376,25 @@
         <artifactId>spotless-maven-plugin</artifactId>
         <version>${spotless.version}</version>
         <configuration>
-          <!-- optional: limit format enforcement to just the files changed from this point -->
-          <ratchetFrom>762390045ba2cc5884e91ecbe363015b7e684878</ratchetFrom>
           <!-- define a language-specific format -->
           <java>
+            <excludes>
+              <exclude>**/generated/*</exclude>
+              <exclude>**/package-info.java</exclude>
+            </excludes>
+            <!--
+              e.g., remove the following lines:
+              "* @param paramName"
+              "* @throws ExceptionType"
+              "* @return returnType"'
+              Multiline to allow anchors on newlines
+            -->
+            <replaceRegex>
+              <name>Remove unhelpful javadoc stubs</name>
+              <searchRegex>(?m)^ *\* *@(?:param|throws|return) *\w* *\n</searchRegex>
+              <!-- spotless manve plugin does not allow empty here, so use \n -->
+              <replacement>\n</replacement>
+            </replaceRegex>
             <!-- apply a specific flavor -->
             <eclipse>
               <file>${session.executionRootDirectory}/dev-support/hbase_eclipse_formatter.xml</file>
@@ -2385,19 +2402,40 @@
             <importOrder>
               <file>${session.executionRootDirectory}/dev-support/eclipse.importorder</file>
             </importOrder>
+            <trimTrailingWhitespace/>
+            <endWithNewline/>
             <!-- make sure every file has the following copyright header.
               optionally, Spotless can set copyright years by digging
               through git history (see "license" section below) -->
             <licenseHeader>
               <file>${session.executionRootDirectory}/dev-support/license-header</file>
             </licenseHeader>
+            <removeUnusedImports/>
           </java>
           <pom>
             <sortPom>
               <expandEmptyElements>false</expandEmptyElements>
             </sortPom>
           </pom>
-          <removeUnusedImports/>
+          <formats>
+            <!-- you can define as many formats as you want, each is independent -->
+            <format>
+              <!-- define the files to apply to -->
+              <includes>
+                <include>**/*.xml</include>
+                <include>**/*.sh</include>
+                <include>**/*.py</include>
+                <include>**/Jenkinsfile*</include>
+                <include>**/*.md</include>
+                <include>*.md</include>
+                <include>**/*.txt</include>
+                <include>*.txt</include>
+              </includes>
+              <!-- define the steps to apply to those files -->
+              <trimTrailingWhitespace/>
+              <endWithNewline/>
+            </format>
+          </formats>
         </configuration>
       </plugin>
     </plugins>


[hbase] 02/02: HBASE-26899 Run spotless:apply

Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 1a5b1b266cd412ece0ed66bac8214d0b4025dfd7
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Sun May 1 22:41:49 2022 +0800

    HBASE-26899 Run spotless:apply
---
 RELEASENOTES.md                                    |  301 ++-
 bin/considerAsDead.sh                              |    8 +-
 bin/hbase-cleanup.sh                               |    6 +-
 bin/hbase-config.sh                                |    4 +-
 bin/master-backup.sh                               |    6 +-
 bin/regionservers.sh                               |    4 +-
 bin/stop-hbase.sh                                  |    4 +-
 bin/test/process_based_cluster.sh                  |    4 +-
 bin/zookeepers.sh                                  |    2 +-
 conf/hbase-env.sh                                  |   10 +-
 conf/hbase-policy.xml                              |   16 +-
 dev-support/HBase Code Template.xml                |    2 +-
 dev-support/HOW_TO_YETUS_LOCAL.md                  |    2 +-
 .../hbase_nightly_pseudo-distributed-test.sh       |   56 +-
 dev-support/hbasetests.sh                          |  106 +-
 dev-support/jenkinsEnv.sh                          |    1 -
 dev-support/make_rc.sh                             |    2 +-
 dev-support/rebase_all_git_branches.sh             |   22 +-
 dev-support/smart-apply-patch.sh                   |    2 +-
 dev-support/test-util.sh                           |    6 +-
 dev-support/zombie-detector.sh                     |    2 +-
 hbase-annotations/pom.xml                          |    4 +-
 .../hbase/testclassification/ClientTests.java      |    2 -
 .../hbase/testclassification/CoprocessorTests.java |    2 -
 .../hbase/testclassification/FilterTests.java      |    2 -
 .../hbase/testclassification/FlakeyTests.java      |    2 -
 .../hadoop/hbase/testclassification/IOTests.java   |    2 -
 .../hbase/testclassification/IntegrationTests.java |   17 +-
 .../hbase/testclassification/LargeTests.java       |   18 +-
 .../hbase/testclassification/MapReduceTests.java   |    2 -
 .../hbase/testclassification/MasterTests.java      |    2 -
 .../hbase/testclassification/MediumTests.java      |   17 +-
 .../hbase/testclassification/MetricsTests.java     |    1 -
 .../hadoop/hbase/testclassification/MiscTests.java |    2 -
 .../hadoop/hbase/testclassification/RPCTests.java  |    2 -
 .../testclassification/RegionServerTests.java      |    2 -
 .../hbase/testclassification/ReplicationTests.java |    2 -
 .../hadoop/hbase/testclassification/RestTests.java |    2 -
 .../hbase/testclassification/SecurityTests.java    |    2 -
 .../hbase/testclassification/SmallTests.java       |   14 +-
 .../testclassification/VerySlowMapReduceTests.java |    4 +-
 .../VerySlowRegionServerTests.java                 |    2 -
 .../hadoop/hbase/testclassification/ZKTests.java   |    1 -
 hbase-archetypes/hbase-archetype-builder/pom.xml   |   61 +-
 hbase-archetypes/hbase-client-project/pom.xml      |    7 +-
 .../archetypes/exemplars/client/HelloHBase.java    |  112 +-
 .../exemplars/client/TestHelloHBase.java           |   34 +-
 .../hbase-shaded-client-project/pom.xml            |   27 +-
 .../exemplars/shaded_client/HelloHBase.java        |  111 +-
 .../exemplars/shaded_client/TestHelloHBase.java    |   34 +-
 hbase-archetypes/pom.xml                           |    9 +-
 hbase-assembly/pom.xml                             |  335 ++-
 hbase-asyncfs/pom.xml                              |   69 +-
 .../hadoop/hbase/io/asyncfs/AsyncFSOutput.java     |    5 +-
 .../hbase/io/asyncfs/AsyncFSOutputHelper.java      |    8 +-
 .../io/asyncfs/FanOutOneBlockAsyncDFSOutput.java   |   40 +-
 .../FanOutOneBlockAsyncDFSOutputHelper.java        |  131 +-
 .../FanOutOneBlockAsyncDFSOutputSaslHelper.java    |  118 +-
 .../hadoop/hbase/io/asyncfs/ProtobufDecoder.java   |   58 +-
 .../hbase/io/asyncfs/SendBufSizePredictor.java     |    2 +-
 .../hbase/io/asyncfs/WrapperAsyncFSOutput.java     |    9 +-
 .../io/asyncfs/monitor/ExcludeDatanodeManager.java |   31 +-
 .../io/asyncfs/monitor/StreamSlowMonitor.java      |   70 +-
 .../hadoop/hbase/util/CancelableProgressable.java  |    9 +-
 .../hadoop/hbase/util/RecoverLeaseFSUtils.java     |   24 +-
 .../hadoop/hbase/io/asyncfs/AsyncFSTestBase.java   |    2 +-
 .../io/asyncfs/TestExcludeDatanodeManager.java     |   45 +-
 .../asyncfs/TestFanOutOneBlockAsyncDFSOutput.java  |    9 +-
 .../TestFanOutOneBlockAsyncDFSOutputHang.java      |    7 +-
 .../hbase/io/asyncfs/TestLocalAsyncOutput.java     |    2 +-
 .../TestOverwriteFileUnderConstruction.java        |    2 +-
 .../TestSaslFanOutOneBlockAsyncDFSOutput.java      |    4 +-
 .../hbase/io/asyncfs/TestSendBufSizePredictor.java |    4 +-
 .../hadoop/hbase/security/HBaseKerberosUtils.java  |    6 +-
 .../hadoop/hbase/util/TestRecoverLeaseFSUtils.java |    7 +-
 hbase-build-configuration/pom.xml                  |   32 +-
 hbase-checkstyle/pom.xml                           |   56 +-
 hbase-client/pom.xml                               |   59 +-
 .../java/org/apache/hadoop/hbase/Abortable.java    |   12 +-
 .../hadoop/hbase/AsyncMetaTableAccessor.java       |  171 +-
 .../apache/hadoop/hbase/CacheEvictionStats.java    |   18 +-
 .../hadoop/hbase/CacheEvictionStatsAggregator.java |    5 +-
 .../hadoop/hbase/CacheEvictionStatsBuilder.java    |    6 +-
 .../apache/hadoop/hbase/CallDroppedException.java  |    7 +-
 .../hadoop/hbase/CallQueueTooBigException.java     |    7 +-
 .../hadoop/hbase/ClockOutOfSyncException.java      |    7 +-
 .../java/org/apache/hadoop/hbase/ClusterId.java    |   25 +-
 .../org/apache/hadoop/hbase/ClusterMetrics.java    |   63 +-
 .../apache/hadoop/hbase/ClusterMetricsBuilder.java |  247 +-
 .../org/apache/hadoop/hbase/ClusterStatus.java     |  150 +-
 .../ConcurrentTableModificationException.java      |    3 +-
 .../java/org/apache/hadoop/hbase/Coprocessor.java  |   39 +-
 .../hadoop/hbase/CoprocessorEnvironment.java       |   18 +-
 .../apache/hadoop/hbase/DoNotRetryIOException.java |    5 +-
 .../hadoop/hbase/DroppedSnapshotException.java     |   21 +-
 ...iledCloseWALAfterInitializedErrorException.java |   22 +-
 .../apache/hadoop/hbase/HBaseServerException.java  |    6 +-
 .../org/apache/hadoop/hbase/HColumnDescriptor.java |  255 +-
 .../java/org/apache/hadoop/hbase/HRegionInfo.java  |  576 ++--
 .../org/apache/hadoop/hbase/HRegionLocation.java   |   36 +-
 .../org/apache/hadoop/hbase/HTableDescriptor.java  |  381 ++-
 .../hbase/InvalidFamilyOperationException.java     |    8 +-
 .../org/apache/hadoop/hbase/KeepDeletedCells.java  |   21 +-
 .../hadoop/hbase/MasterNotRunningException.java    |    4 +-
 .../hadoop/hbase/MemoryCompactionPolicy.java       |   16 +-
 .../org/apache/hadoop/hbase/MetaTableAccessor.java |  737 +++---
 .../hadoop/hbase/MultiActionResultTooLarge.java    |   11 +-
 .../hadoop/hbase/NamespaceExistException.java      |    3 +-
 .../hadoop/hbase/NamespaceNotFoundException.java   |    3 +-
 .../hbase/NotAllMetaRegionsOnlineException.java    |    7 +-
 .../hadoop/hbase/NotServingRegionException.java    |    4 +-
 .../apache/hadoop/hbase/PleaseHoldException.java   |   11 +-
 .../hadoop/hbase/PleaseRestartMasterException.java |    2 -
 .../apache/hadoop/hbase/RSGroupTableAccessor.java  |   20 +-
 .../org/apache/hadoop/hbase/RegionException.java   |    6 +-
 .../java/org/apache/hadoop/hbase/RegionLoad.java   |  156 +-
 .../org/apache/hadoop/hbase/RegionLocations.java   |  118 +-
 .../org/apache/hadoop/hbase/RegionMetrics.java     |   18 +-
 .../apache/hadoop/hbase/RegionMetricsBuilder.java  |  325 +--
 .../hadoop/hbase/RegionTooBusyException.java       |   13 +-
 .../hbase/ReplicationPeerNotFoundException.java    |    3 +-
 .../hadoop/hbase/RetryImmediatelyException.java    |    5 +-
 .../java/org/apache/hadoop/hbase/ServerLoad.java   |  217 +-
 .../org/apache/hadoop/hbase/ServerMetrics.java     |   11 +-
 .../apache/hadoop/hbase/ServerMetricsBuilder.java  |  124 +-
 .../java/org/apache/hadoop/hbase/ServerTask.java   |    2 +-
 .../org/apache/hadoop/hbase/ServerTaskBuilder.java |    7 +-
 .../main/java/org/apache/hadoop/hbase/Size.java    |   16 +-
 .../apache/hadoop/hbase/TableExistsException.java  |   13 +-
 .../hadoop/hbase/TableInfoMissingException.java    |    4 +-
 .../hadoop/hbase/TableNotDisabledException.java    |    3 +-
 .../hadoop/hbase/TableNotEnabledException.java     |    4 +-
 .../hadoop/hbase/TableNotFoundException.java       |    3 +-
 .../hadoop/hbase/UnknownRegionException.java       |    7 +-
 .../hadoop/hbase/UnknownScannerException.java      |   12 +-
 .../java/org/apache/hadoop/hbase/UserMetrics.java  |   14 +-
 .../apache/hadoop/hbase/UserMetricsBuilder.java    |   76 +-
 .../hadoop/hbase/ZooKeeperConnectionException.java |    7 +-
 .../hadoop/hbase/client/AbstractClientScanner.java |    4 +-
 .../hadoop/hbase/client/AbstractResponse.java      |    8 +-
 .../client/AbstractRpcBasedConnectionRegistry.java |    9 +-
 .../org/apache/hadoop/hbase/client/Action.java     |   15 +-
 .../java/org/apache/hadoop/hbase/client/Admin.java | 1550 +++++------
 .../hbase/client/AdvancedScanResultConsumer.java   |   14 +-
 .../hbase/client/AllowPartialScanResultCache.java  |    3 +-
 .../org/apache/hadoop/hbase/client/Append.java     |   80 +-
 .../org/apache/hadoop/hbase/client/AsyncAdmin.java |  478 ++--
 .../hadoop/hbase/client/AsyncAdminBuilder.java     |   15 +-
 .../hadoop/hbase/client/AsyncAdminBuilderBase.java |    3 +-
 .../client/AsyncAdminRequestRetryingCaller.java    |    6 +-
 .../hbase/client/AsyncBatchRpcRetryingCaller.java  |   41 +-
 .../hadoop/hbase/client/AsyncBufferedMutator.java  |    2 +-
 .../hbase/client/AsyncBufferedMutatorBuilder.java  |    3 +-
 .../client/AsyncBufferedMutatorBuilderImpl.java    |    4 +-
 .../hbase/client/AsyncBufferedMutatorImpl.java     |    9 +-
 .../hadoop/hbase/client/AsyncClientScanner.java    |   50 +-
 .../hadoop/hbase/client/AsyncConnection.java       |   10 +-
 .../hbase/client/AsyncConnectionConfiguration.java |   44 +-
 .../hadoop/hbase/client/AsyncConnectionImpl.java   |    8 +-
 .../hadoop/hbase/client/AsyncHBaseAdmin.java       |   80 +-
 .../AsyncMasterRequestRpcRetryingCaller.java       |   12 +-
 .../hbase/client/AsyncMetaRegionLocator.java       |    8 +-
 .../hbase/client/AsyncNonMetaRegionLocator.java    |   69 +-
 .../apache/hadoop/hbase/client/AsyncProcess.java   |  163 +-
 .../hadoop/hbase/client/AsyncProcessTask.java      |   39 +-
 .../hadoop/hbase/client/AsyncRegionLocator.java    |   79 +-
 .../hbase/client/AsyncRegionLocatorHelper.java     |   11 +-
 .../hadoop/hbase/client/AsyncRequestFuture.java    |    8 +-
 .../hbase/client/AsyncRequestFutureImpl.java       |  370 ++-
 .../hbase/client/AsyncRpcRetryingCaller.java       |   21 +-
 .../client/AsyncRpcRetryingCallerFactory.java      |   28 +-
 .../AsyncScanSingleRegionRpcRetryingCaller.java    |   58 +-
 .../AsyncServerRequestRpcRetryingCaller.java       |   14 +-
 .../AsyncSingleRequestRpcRetryingCaller.java       |   18 +-
 .../org/apache/hadoop/hbase/client/AsyncTable.java |   66 +-
 .../hadoop/hbase/client/AsyncTableBuilder.java     |   15 +-
 .../hadoop/hbase/client/AsyncTableBuilderBase.java |    8 +-
 .../apache/hadoop/hbase/client/AsyncTableImpl.java |   10 +-
 .../hbase/client/AsyncTableRegionLocator.java      |   12 +-
 .../hbase/client/AsyncTableRegionLocatorImpl.java  |    6 +-
 .../hbase/client/AsyncTableResultScanner.java      |    2 +-
 .../org/apache/hadoop/hbase/client/Attributes.java |   10 +-
 .../apache/hadoop/hbase/client/BalanceRequest.java |   37 +-
 .../hadoop/hbase/client/BalanceResponse.java       |   28 +-
 .../hadoop/hbase/client/BalancerDecision.java      |   29 +-
 .../hadoop/hbase/client/BalancerRejection.java     |   41 +-
 .../apache/hadoop/hbase/client/BatchErrors.java    |   14 +-
 .../hadoop/hbase/client/BatchScanResultCache.java  |   10 +-
 .../hadoop/hbase/client/BufferedMutator.java       |  114 +-
 .../hadoop/hbase/client/BufferedMutatorImpl.java   |  146 +-
 .../hadoop/hbase/client/BufferedMutatorParams.java |   32 +-
 .../apache/hadoop/hbase/client/Cancellable.java    |   10 +-
 .../client/CancellableRegionServerCallable.java    |   64 +-
 .../client/CatalogReplicaLoadBalanceSelector.java  |    7 +-
 .../CatalogReplicaLoadBalanceSelectorFactory.java  |    8 +-
 .../CatalogReplicaLoadBalanceSimpleSelector.java   |  110 +-
 .../hadoop/hbase/client/CatalogReplicaMode.java    |   26 +-
 .../apache/hadoop/hbase/client/CheckAndMutate.java |   36 +-
 .../hbase/client/ClientAsyncPrefetchScanner.java   |    8 +-
 .../client/ClientCoprocessorRpcController.java     |    3 +-
 .../hadoop/hbase/client/ClientIdGenerator.java     |   25 +-
 .../apache/hadoop/hbase/client/ClientScanner.java  |   38 +-
 .../hadoop/hbase/client/ClientServiceCallable.java |   37 +-
 .../hadoop/hbase/client/ClientSimpleScanner.java   |   18 +-
 .../org/apache/hadoop/hbase/client/ClientUtil.java |   25 +-
 .../hadoop/hbase/client/ClusterConnection.java     |  156 +-
 .../hadoop/hbase/client/ClusterStatusListener.java |   57 +-
 .../hbase/client/ColumnFamilyDescriptor.java       |  147 +-
 .../client/ColumnFamilyDescriptorBuilder.java      |  396 ++-
 .../apache/hadoop/hbase/client/CompactType.java    |   15 +-
 .../hadoop/hbase/client/CompactionState.java       |    7 +-
 .../hbase/client/CompleteScanResultCache.java      |    5 +-
 .../org/apache/hadoop/hbase/client/Connection.java |  149 +-
 .../hbase/client/ConnectionConfiguration.java      |  100 +-
 .../hadoop/hbase/client/ConnectionFactory.java     |   24 +-
 .../hbase/client/ConnectionImplementation.java     |  440 ++--
 .../hadoop/hbase/client/ConnectionRegistry.java    |    4 +-
 .../hbase/client/ConnectionRegistryFactory.java    |    1 +
 .../hadoop/hbase/client/ConnectionUtils.java       |   34 +-
 .../apache/hadoop/hbase/client/Consistency.java    |   31 +-
 .../hadoop/hbase/client/CoprocessorDescriptor.java |   11 +-
 .../hbase/client/CoprocessorDescriptorBuilder.java |    7 +-
 .../org/apache/hadoop/hbase/client/Cursor.java     |    9 +-
 .../apache/hadoop/hbase/client/DelayingRunner.java |   31 +-
 .../org/apache/hadoop/hbase/client/Delete.java     |  199 +-
 .../hbase/client/DoNotRetryRegionException.java    |    3 +-
 .../org/apache/hadoop/hbase/client/Durability.java |   23 +-
 .../apache/hadoop/hbase/client/FailureInfo.java    |   19 +-
 .../hbase/client/FastFailInterceptorContext.java   |    5 +-
 .../hadoop/hbase/client/FlushRegionCallable.java   |   25 +-
 .../java/org/apache/hadoop/hbase/client/Get.java   |  149 +-
 .../org/apache/hadoop/hbase/client/HBaseAdmin.java | 1825 +++++++------
 .../org/apache/hadoop/hbase/client/HBaseHbck.java  |   85 +-
 .../apache/hadoop/hbase/client/HRegionLocator.java |   75 +-
 .../org/apache/hadoop/hbase/client/HTable.java     |  572 ++--
 .../hadoop/hbase/client/HTableMultiplexer.java     |  135 +-
 .../java/org/apache/hadoop/hbase/client/Hbck.java  |   76 +-
 .../hbase/client/ImmutableHColumnDescriptor.java   |   12 +-
 .../hadoop/hbase/client/ImmutableHRegionInfo.java  |    7 +-
 .../hbase/client/ImmutableHTableDescriptor.java    |   12 +-
 .../apache/hadoop/hbase/client/ImmutableScan.java  |    3 -
 .../org/apache/hadoop/hbase/client/Increment.java  |  123 +-
 .../apache/hadoop/hbase/client/IsolationLevel.java |   22 +-
 .../hadoop/hbase/client/LockTimeoutException.java  |    3 +-
 .../org/apache/hadoop/hbase/client/LogEntry.java   |    6 +-
 .../apache/hadoop/hbase/client/LogQueryFilter.java |   43 +-
 .../apache/hadoop/hbase/client/MasterCallable.java |   45 +-
 .../client/MasterCoprocessorRpcChannelImpl.java    |   15 +-
 .../hbase/client/MasterKeepAliveConnection.java    |   25 +-
 .../apache/hadoop/hbase/client/MasterRegistry.java |    2 +-
 .../hadoop/hbase/client/MasterSwitchType.java      |    4 +-
 .../org/apache/hadoop/hbase/client/MetaCache.java  |   80 +-
 .../hadoop/hbase/client/MetricsConnection.java     |  183 +-
 .../hbase/client/MobCompactPartitionPolicy.java    |    1 -
 .../apache/hadoop/hbase/client/MultiAction.java    |   28 +-
 .../apache/hadoop/hbase/client/MultiResponse.java  |   35 +-
 .../hadoop/hbase/client/MultiServerCallable.java   |   27 +-
 .../hadoop/hbase/client/MutableRegionInfo.java     |   95 +-
 .../org/apache/hadoop/hbase/client/Mutation.java   |  365 ++-
 .../client/NoOpRetryableCallerInterceptor.java     |   23 +-
 .../client/NoOpRetryingInterceptorContext.java     |    2 +-
 .../hbase/client/NoServerForRegionException.java   |    3 +-
 .../apache/hadoop/hbase/client/NonceGenerator.java |   10 +-
 .../hbase/client/NoncedRegionServerCallable.java   |   36 +-
 .../hbase/client/NormalizeTableFilterParams.java   |   29 +-
 .../hadoop/hbase/client/OnlineLogRecord.java       |   87 +-
 .../org/apache/hadoop/hbase/client/Operation.java  |   45 +-
 .../hbase/client/OperationWithAttributes.java      |   28 +-
 .../hbase/client/PackagePrivateFieldAccessor.java  |    2 +-
 .../client/PerClientRandomNonceGenerator.java      |    7 +-
 .../client/PreemptiveFastFailInterceptor.java      |  177 +-
 .../java/org/apache/hadoop/hbase/client/Put.java   |  153 +-
 .../java/org/apache/hadoop/hbase/client/Query.java |  102 +-
 .../hadoop/hbase/client/RawAsyncHBaseAdmin.java    | 1308 +++++----
 .../hadoop/hbase/client/RawAsyncTableImpl.java     |  292 +--
 .../hbase/client/RegionAdminServiceCallable.java   |   57 +-
 .../hbase/client/RegionCoprocessorRpcChannel.java  |   52 +-
 .../client/RegionCoprocessorRpcChannelImpl.java    |   36 +-
 .../hbase/client/RegionCoprocessorServiceExec.java |   39 +-
 .../org/apache/hadoop/hbase/client/RegionInfo.java |  373 ++-
 .../hadoop/hbase/client/RegionInfoBuilder.java     |   14 +-
 .../hadoop/hbase/client/RegionInfoDisplay.java     |   45 +-
 .../hadoop/hbase/client/RegionLoadStats.java       |    6 +-
 .../hadoop/hbase/client/RegionLocateType.java      |    6 +-
 .../apache/hadoop/hbase/client/RegionLocator.java  |   23 +-
 .../hbase/client/RegionOfflineException.java       |    4 +-
 .../hadoop/hbase/client/RegionReplicaUtil.java     |   67 +-
 .../hadoop/hbase/client/RegionServerCallable.java  |  100 +-
 .../RegionServerCoprocessorRpcChannelImpl.java     |   15 +-
 .../hadoop/hbase/client/RegionStatesCount.java     |    4 +-
 .../hbase/client/RegistryEndpointsRefresher.java   |    4 +-
 .../hadoop/hbase/client/RequestController.java     |   45 +-
 .../hbase/client/RequestControllerFactory.java     |   10 +-
 .../org/apache/hadoop/hbase/client/Result.java     |  565 ++--
 .../client/ResultBoundedCompletionService.java     |   79 +-
 .../hadoop/hbase/client/ResultStatsUtil.java       |   11 +-
 .../hbase/client/RetriesExhaustedException.java    |   37 +-
 .../RetriesExhaustedWithDetailsException.java      |   44 +-
 .../hadoop/hbase/client/RetryingCallable.java      |   24 +-
 .../hbase/client/RetryingCallerInterceptor.java    |   66 +-
 .../client/RetryingCallerInterceptorContext.java   |   40 +-
 .../client/RetryingCallerInterceptorFactory.java   |   45 +-
 .../hadoop/hbase/client/RetryingTimeTracker.java   |   21 +-
 .../hadoop/hbase/client/ReversedClientScanner.java |   40 +-
 .../hbase/client/ReversedScannerCallable.java      |   93 +-
 .../java/org/apache/hadoop/hbase/client/Row.java   |    8 +-
 .../org/apache/hadoop/hbase/client/RowAccess.java  |    7 +-
 .../apache/hadoop/hbase/client/RowMutations.java   |   57 +-
 .../hadoop/hbase/client/RowTooBigException.java    |    9 +-
 .../hadoop/hbase/client/RpcConnectionRegistry.java |    4 +-
 .../hadoop/hbase/client/RpcRetryingCallable.java   |    3 +-
 .../hadoop/hbase/client/RpcRetryingCaller.java     |   22 +-
 .../hbase/client/RpcRetryingCallerFactory.java     |   38 +-
 .../hadoop/hbase/client/RpcRetryingCallerImpl.java |   77 +-
 .../client/RpcRetryingCallerWithReadReplicas.java  |  119 +-
 .../java/org/apache/hadoop/hbase/client/Scan.java  |  431 ++-
 .../hadoop/hbase/client/ScanResultCache.java       |    5 +-
 .../hadoop/hbase/client/ScanResultConsumer.java    |    2 +-
 .../hbase/client/ScanResultConsumerBase.java       |    2 +-
 .../hadoop/hbase/client/ScannerCallable.java       |   74 +-
 .../hbase/client/ScannerCallableWithReplicas.java  |  106 +-
 .../hadoop/hbase/client/SecureBulkLoadClient.java  |  109 +-
 .../hbase/client/ServerStatisticTracker.java       |    8 +-
 .../org/apache/hadoop/hbase/client/ServerType.java |    8 +-
 .../apache/hadoop/hbase/client/ServiceCaller.java  |    7 +-
 .../hbase/client/ShortCircuitMasterConnection.java |  197 +-
 .../hbase/client/SimpleRequestController.java      |  145 +-
 .../apache/hadoop/hbase/client/SingleResponse.java |    3 +-
 .../apache/hadoop/hbase/client/SlowLogParams.java  |   19 +-
 .../hadoop/hbase/client/SnapshotDescription.java   |   54 +-
 .../apache/hadoop/hbase/client/SnapshotType.java   |    6 +-
 .../hadoop/hbase/client/StatisticTrackable.java    |   19 +-
 .../hbase/client/SyncCoprocessorRpcChannel.java    |   33 +-
 .../java/org/apache/hadoop/hbase/client/Table.java |  629 ++---
 .../apache/hadoop/hbase/client/TableBuilder.java   |    5 +-
 .../hadoop/hbase/client/TableBuilderBase.java      |    7 +-
 .../hadoop/hbase/client/TableDescriptor.java       |  137 +-
 .../hbase/client/TableDescriptorBuilder.java       |  556 ++--
 .../hadoop/hbase/client/TableDescriptorUtils.java  |   11 +-
 .../org/apache/hadoop/hbase/client/TableState.java |   96 +-
 .../hbase/client/UnmodifyableHRegionInfo.java      |    8 +-
 .../hadoop/hbase/client/ZKConnectionRegistry.java  |   18 +-
 .../hbase/client/backoff/ClientBackoffPolicy.java  |    9 +-
 .../client/backoff/ClientBackoffPolicyFactory.java |   13 +-
 .../backoff/ExponentialClientBackoffPolicy.java    |   22 +-
 .../hbase/client/backoff/ServerStatistics.java     |   23 +-
 .../hadoop/hbase/client/coprocessor/Batch.java     |   37 +-
 .../coprocessor/BigDecimalColumnInterpreter.java   |   28 +-
 .../coprocessor/DoubleColumnInterpreter.java       |   41 +-
 .../client/coprocessor/LongColumnInterpreter.java  |   35 +-
 .../hadoop/hbase/client/metrics/ScanMetrics.java   |   28 +-
 .../client/metrics/ServerSideScanMetrics.java      |   31 +-
 .../hbase/client/replication/ReplicationAdmin.java |  168 +-
 .../replication/ReplicationPeerConfigUtil.java     |  152 +-
 .../hadoop/hbase/client/replication/TableCFs.java  |    8 +-
 .../hbase/client/security/SecurityCapability.java  |   18 +-
 .../hbase/client/trace/ConnectionSpanBuilder.java  |   43 +-
 .../hbase/client/trace/IpcClientSpanBuilder.java   |   19 +-
 .../client/trace/TableOperationSpanBuilder.java    |   37 +-
 .../hbase/client/trace/TableSpanBuilder.java       |   13 +-
 .../hbase/coprocessor/ColumnInterpreter.java       |  127 +-
 .../hbase/coprocessor/CoprocessorException.java    |    9 +-
 .../hbase/exceptions/ClientExceptionsUtil.java     |   30 +-
 .../exceptions/ConnectionClosedException.java      |    5 +-
 .../exceptions/ConnectionClosingException.java     |   16 +-
 .../exceptions/FailedSanityCheckException.java     |    7 +-
 .../exceptions/MasterRegistryFetchException.java   |    2 +-
 .../hbase/exceptions/MasterStoppedException.java   |    2 +-
 .../hbase/exceptions/MergeRegionException.java     |    6 +-
 .../exceptions/OutOfOrderScannerNextException.java |    2 +-
 .../exceptions/PreemptiveFastFailException.java    |   64 +-
 .../hbase/exceptions/RegionMovedException.java     |   24 +-
 .../hbase/exceptions/RegionOpeningException.java   |    5 +-
 .../hbase/exceptions/RequestTooBigException.java   |    8 +-
 .../hbase/exceptions/ScannerResetException.java    |    3 +-
 .../hbase/exceptions/UnknownProtocolException.java |    6 +-
 .../hadoop/hbase/filter/BigDecimalComparator.java  |   20 +-
 .../hadoop/hbase/filter/BinaryComparator.java      |   31 +-
 .../hbase/filter/BinaryComponentComparator.java    |   33 +-
 .../hbase/filter/BinaryPrefixComparator.java       |   35 +-
 .../apache/hadoop/hbase/filter/BitComparator.java  |   49 +-
 .../hadoop/hbase/filter/ColumnCountGetFilter.java  |   33 +-
 .../hbase/filter/ColumnPaginationFilter.java       |  105 +-
 .../hadoop/hbase/filter/ColumnPrefixFilter.java    |   48 +-
 .../hadoop/hbase/filter/ColumnRangeFilter.java     |   99 +-
 .../hadoop/hbase/filter/ColumnValueFilter.java     |   65 +-
 .../apache/hadoop/hbase/filter/CompareFilter.java  |  137 +-
 .../hadoop/hbase/filter/DependentColumnFilter.java |  177 +-
 .../apache/hadoop/hbase/filter/FamilyFilter.java   |   74 +-
 .../org/apache/hadoop/hbase/filter/Filter.java     |  180 +-
 .../org/apache/hadoop/hbase/filter/FilterBase.java |   77 +-
 .../org/apache/hadoop/hbase/filter/FilterList.java |   31 +-
 .../apache/hadoop/hbase/filter/FilterListBase.java |    8 +-
 .../hadoop/hbase/filter/FilterListWithAND.java     |   28 +-
 .../hadoop/hbase/filter/FilterListWithOR.java      |  230 +-
 .../hadoop/hbase/filter/FirstKeyOnlyFilter.java    |   30 +-
 .../FirstKeyValueMatchingQualifiersFilter.java     |   47 +-
 .../apache/hadoop/hbase/filter/FuzzyRowFilter.java |   97 +-
 .../hadoop/hbase/filter/InclusiveStopFilter.java   |   57 +-
 .../hbase/filter/IncompatibleFilterException.java  |    5 +-
 .../hbase/filter/InvalidRowFilterException.java    |    4 +-
 .../apache/hadoop/hbase/filter/KeyOnlyFilter.java  |   47 +-
 .../apache/hadoop/hbase/filter/LongComparator.java |   77 +-
 .../hadoop/hbase/filter/MultiRowRangeFilter.java   |  256 +-
 .../hbase/filter/MultipleColumnPrefixFilter.java   |   97 +-
 .../apache/hadoop/hbase/filter/NullComparator.java |   34 +-
 .../org/apache/hadoop/hbase/filter/PageFilter.java |   44 +-
 .../apache/hadoop/hbase/filter/ParseConstants.java |   52 +-
 .../apache/hadoop/hbase/filter/ParseFilter.java    |  738 +++---
 .../apache/hadoop/hbase/filter/PrefixFilter.java   |   45 +-
 .../hadoop/hbase/filter/QualifierFilter.java       |   59 +-
 .../hadoop/hbase/filter/RandomRowFilter.java       |   38 +-
 .../hadoop/hbase/filter/RegexStringComparator.java |  116 +-
 .../org/apache/hadoop/hbase/filter/RowFilter.java  |   65 +-
 .../filter/SingleColumnValueExcludeFilter.java     |  173 +-
 .../hbase/filter/SingleColumnValueFilter.java      |  283 +-
 .../org/apache/hadoop/hbase/filter/SkipFilter.java |   47 +-
 .../hadoop/hbase/filter/SubstringComparator.java   |   41 +-
 .../hadoop/hbase/filter/TimestampsFilter.java      |   70 +-
 .../apache/hadoop/hbase/filter/ValueFilter.java    |   63 +-
 .../hadoop/hbase/filter/WhileMatchFilter.java      |   30 +-
 .../apache/hadoop/hbase/ipc/AbstractRpcClient.java |   94 +-
 .../apache/hadoop/hbase/ipc/BadAuthException.java  |    2 +-
 .../hadoop/hbase/ipc/BlockingRpcCallback.java      |   20 +-
 .../apache/hadoop/hbase/ipc/BlockingRpcClient.java |    8 +-
 .../hadoop/hbase/ipc/BlockingRpcConnection.java    |  101 +-
 .../hbase/ipc/BufferCallBeforeInitHandler.java     |   20 +-
 .../java/org/apache/hadoop/hbase/ipc/Call.java     |   25 +-
 .../hadoop/hbase/ipc/CallCancelledException.java   |    2 +-
 .../org/apache/hadoop/hbase/ipc/CallEvent.java     |    5 +-
 .../hadoop/hbase/ipc/CallTimeoutException.java     |    5 +-
 .../hbase/ipc/CallerDisconnectedException.java     |    9 +-
 .../apache/hadoop/hbase/ipc/CellBlockBuilder.java  |   76 +-
 .../hbase/ipc/CellScannerButNoCodecException.java  |    2 +-
 .../org/apache/hadoop/hbase/ipc/ConnectionId.java  |   20 +-
 .../hadoop/hbase/ipc/CoprocessorRpcChannel.java    |   12 +-
 .../hadoop/hbase/ipc/CoprocessorRpcUtils.java      |  147 +-
 .../hbase/ipc/DelegatingHBaseRpcController.java    |    9 +-
 .../hadoop/hbase/ipc/FailedServerException.java    |    9 +-
 .../org/apache/hadoop/hbase/ipc/FailedServers.java |   17 +-
 .../hbase/ipc/FallbackDisallowedException.java     |    4 +-
 .../hadoop/hbase/ipc/FatalConnectionException.java |    7 +-
 .../hadoop/hbase/ipc/HBaseRpcController.java       |   15 +-
 .../hadoop/hbase/ipc/HBaseRpcControllerImpl.java   |   14 +-
 .../java/org/apache/hadoop/hbase/ipc/IPCUtil.java  |   78 +-
 .../apache/hadoop/hbase/ipc/NettyRpcClient.java    |    9 +-
 .../hbase/ipc/NettyRpcClientConfigHelper.java      |   13 +-
 .../hadoop/hbase/ipc/NettyRpcConnection.java       |    2 +-
 .../hadoop/hbase/ipc/NettyRpcDuplexHandler.java    |   16 +-
 .../hbase/ipc/RemoteWithExtrasException.java       |   22 +-
 .../org/apache/hadoop/hbase/ipc/RpcClient.java     |   41 +-
 .../apache/hadoop/hbase/ipc/RpcClientFactory.java  |   23 +-
 .../org/apache/hadoop/hbase/ipc/RpcConnection.java |   20 +-
 .../hadoop/hbase/ipc/RpcControllerFactory.java     |   11 +-
 .../hbase/ipc/ServerNotRunningYetException.java    |    3 -
 .../hadoop/hbase/ipc/ServerRpcController.java      |   25 +-
 .../hadoop/hbase/ipc/ServerTooBusyException.java   |    2 -
 .../hbase/ipc/StoppedRpcClientException.java       |    2 +-
 .../hbase/ipc/UnsupportedCellCodecException.java   |    2 +-
 .../ipc/UnsupportedCompressionCodecException.java  |    2 +-
 .../hbase/ipc/UnsupportedCryptoException.java      |    3 +-
 .../hadoop/hbase/ipc/WrongVersionException.java    |    2 +-
 .../apache/hadoop/hbase/master/RegionState.java    |   79 +-
 .../hadoop/hbase/protobuf/ProtobufMagic.java       |   30 +-
 .../hbase/protobuf/ProtobufMessageConverter.java   |   33 +-
 .../apache/hadoop/hbase/protobuf/ProtobufUtil.java |  778 +++---
 .../hbase/quotas/QuotaExceededException.java       |    3 +-
 .../apache/hadoop/hbase/quotas/QuotaFilter.java    |    3 +-
 .../apache/hadoop/hbase/quotas/QuotaRetriever.java |   26 +-
 .../org/apache/hadoop/hbase/quotas/QuotaScope.java |   15 +-
 .../apache/hadoop/hbase/quotas/QuotaSettings.java  |   79 +-
 .../hadoop/hbase/quotas/QuotaSettingsFactory.java  |  226 +-
 .../apache/hadoop/hbase/quotas/QuotaTableUtil.java |  351 +--
 .../org/apache/hadoop/hbase/quotas/QuotaType.java  |    2 +-
 .../hbase/quotas/RpcThrottlingException.java       |   70 +-
 .../hadoop/hbase/quotas/SpaceLimitSettings.java    |   80 +-
 .../hadoop/hbase/quotas/SpaceQuotaSnapshot.java    |   43 +-
 .../hbase/quotas/SpaceQuotaSnapshotView.java       |    2 +-
 .../hadoop/hbase/quotas/SpaceViolationPolicy.java  |   22 +-
 .../hadoop/hbase/quotas/ThrottleSettings.java      |   31 +-
 .../apache/hadoop/hbase/quotas/ThrottleType.java   |    2 +-
 .../hadoop/hbase/quotas/ThrottlingException.java   |   62 +-
 .../hadoop/hbase/regionserver/BloomType.java       |    4 +-
 .../hadoop/hbase/regionserver/LeaseException.java  |    5 +-
 .../regionserver/NoSuchColumnFamilyException.java  |    3 +-
 .../regionserver/RegionServerAbortedException.java |    3 +-
 .../regionserver/RegionServerRunningException.java |    8 +-
 .../regionserver/RegionServerStoppedException.java |    4 +-
 .../hbase/regionserver/WrongRegionException.java   |    4 +-
 .../regionserver/wal/FailedLogCloseException.java  |   10 +-
 .../wal/FailedSyncBeforeLogCloseException.java     |    9 +-
 .../hbase/replication/ReplicationException.java    |    4 +-
 .../hbase/replication/ReplicationLoadSink.java     |   30 +-
 .../hbase/replication/ReplicationLoadSource.java   |   45 +-
 .../hbase/replication/ReplicationPeerConfig.java   |   48 +-
 .../replication/ReplicationPeerConfigBuilder.java  |   31 +-
 .../replication/ReplicationPeerDescription.java    |    2 +-
 .../hbase/security/AbstractHBaseSaslRpcClient.java |   49 +-
 .../hbase/security/AccessDeniedException.java      |    5 +-
 .../apache/hadoop/hbase/security/AuthMethod.java   |    9 +-
 .../hbase/security/CryptoAESUnwrapHandler.java     |    8 +-
 .../hbase/security/CryptoAESWrapHandler.java       |   11 +-
 .../hadoop/hbase/security/EncryptionUtil.java      |  126 +-
 .../hadoop/hbase/security/HBaseSaslRpcClient.java  |   47 +-
 .../NettyHBaseRpcConnectionHeaderHandler.java      |   19 +-
 .../hbase/security/NettyHBaseSaslRpcClient.java    |   14 +-
 .../security/NettyHBaseSaslRpcClientHandler.java   |   41 +-
 .../hbase/security/SaslChallengeDecoder.java       |   21 +-
 .../apache/hadoop/hbase/security/SaslStatus.java   |    9 +-
 .../hadoop/hbase/security/SaslUnwrapHandler.java   |    9 +-
 .../org/apache/hadoop/hbase/security/SaslUtil.java |   17 +-
 .../hadoop/hbase/security/SaslWrapHandler.java     |    6 +-
 .../apache/hadoop/hbase/security/SecurityInfo.java |   20 +-
 .../hbase/security/access/AccessControlClient.java |  235 +-
 .../security/access/AccessControlConstants.java    |    9 +-
 .../hbase/security/access/AccessControlUtil.java   |  536 ++--
 .../security/access/GetUserPermissionsRequest.java |    5 +-
 .../hbase/security/access/GlobalPermission.java    |    3 +-
 .../hbase/security/access/NamespacePermission.java |    8 +-
 .../hadoop/hbase/security/access/Permission.java   |   66 +-
 .../security/access/ShadedAccessControlUtil.java   |   67 +-
 .../hbase/security/access/TablePermission.java     |   50 +-
 .../hbase/security/access/UserPermission.java      |   13 +-
 .../AbstractSaslClientAuthenticationProvider.java  |    5 +-
 .../provider/AuthenticationProviderSelector.java   |   11 +-
 .../security/provider/BuiltInProviderSelector.java |   49 +-
 .../BuiltInSaslAuthenticationProvider.java         |    5 +-
 .../provider/DigestSaslAuthenticationProvider.java |    4 +-
 .../DigestSaslClientAuthenticationProvider.java    |   12 +-
 .../provider/GssSaslAuthenticationProvider.java    |    4 +-
 .../GssSaslClientAuthenticationProvider.java       |   29 +-
 .../hbase/security/provider/SaslAuthMethod.java    |   17 +-
 .../provider/SaslAuthenticationProvider.java       |   12 +-
 .../provider/SaslClientAuthenticationProvider.java |   41 +-
 .../SaslClientAuthenticationProviders.java         |   77 +-
 .../provider/SimpleSaslAuthenticationProvider.java |    4 +-
 .../SimpleSaslClientAuthenticationProvider.java    |   10 +-
 .../token/AuthenticationTokenIdentifier.java       |   45 +-
 .../token/AuthenticationTokenSelector.java         |   23 +-
 .../hbase/security/token/ClientTokenUtil.java      |   49 +-
 .../hbase/security/visibility/Authorizations.java  |    8 +-
 .../hbase/security/visibility/CellVisibility.java  |   21 +-
 .../security/visibility/InvalidLabelException.java |    1 -
 .../security/visibility/VisibilityClient.java      |  297 +--
 .../security/visibility/VisibilityConstants.java   |   20 +-
 .../VisibilityControllerNotReadyException.java     |    3 +-
 .../visibility/VisibilityLabelsValidator.java      |    3 +-
 .../hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 1837 ++++++-------
 .../hbase/shaded/protobuf/RequestConverter.java    |  930 +++----
 .../hbase/shaded/protobuf/ResponseConverter.java   |  172 +-
 .../hadoop/hbase/slowlog/SlowLogTableAccessor.java |   33 +-
 .../snapshot/ClientSnapshotDescriptionUtils.java   |   25 +-
 .../hbase/snapshot/CorruptedSnapshotException.java |   11 +-
 .../hbase/snapshot/ExportSnapshotException.java    |    4 +-
 .../hbase/snapshot/HBaseSnapshotException.java     |   16 +-
 .../hbase/snapshot/RestoreSnapshotException.java   |   12 +-
 .../hbase/snapshot/SnapshotCreationException.java  |   16 +-
 .../snapshot/SnapshotDoesNotExistException.java    |    4 +-
 .../hbase/snapshot/SnapshotExistsException.java    |    6 +-
 .../snapshot/TablePartiallyOpenException.java      |    3 +-
 .../hbase/snapshot/UnknownSnapshotException.java   |    4 +-
 .../hbase/util/FileSystemVersionException.java     |    5 +-
 .../org/apache/hadoop/hbase/util/JsonMapper.java   |    2 +-
 .../java/org/apache/hadoop/hbase/util/PoolMap.java |  129 +-
 .../org/apache/hadoop/hbase/util/Writables.java    |   75 +-
 .../hadoop/hbase/zookeeper/ReadOnlyZKClient.java   |   17 +-
 .../apache/hadoop/hbase/zookeeper/ZKMetadata.java  |    3 +-
 .../apache/hadoop/hbase/zookeeper/ZNodePaths.java  |   70 +-
 .../hadoop/hbase/zookeeper/ZooKeeperHelper.java    |   19 +-
 .../apache/hadoop/hbase/TestHColumnDescriptor.java |   42 +-
 .../apache/hadoop/hbase/TestHTableDescriptor.java  |   46 +-
 .../apache/hadoop/hbase/TestRegionLocations.java   |   14 +-
 .../hbase/client/RpcRetryingCallerImplTest.java    |   36 +-
 .../hbase/client/TestAsyncAdminRpcPriority.java    |    2 +-
 .../client/TestAsyncConnectionConfiguration.java   |    3 +-
 .../hbase/client/TestAsyncConnectionTracing.java   |   13 +-
 .../hadoop/hbase/client/TestAsyncProcess.java      |  489 ++--
 .../TestAsyncProcessWithRegionException.java       |   53 +-
 .../client/TestAsyncRegionLocatorTracing.java      |   58 +-
 .../hbase/client/TestAsyncTableRpcPriority.java    |   41 +-
 .../hadoop/hbase/client/TestAsyncTableTracing.java |  140 +-
 .../apache/hadoop/hbase/client/TestAttributes.java |   35 +-
 .../hadoop/hbase/client/TestBufferedMutator.java   |   16 +-
 .../hbase/client/TestBufferedMutatorParams.java    |   46 +-
 .../hbase/client/TestClientExponentialBackoff.java |   44 +-
 .../hadoop/hbase/client/TestClientNoCluster.java   |  313 ++-
 .../hadoop/hbase/client/TestClientScanner.java     |  192 +-
 .../client/TestColumnFamilyDescriptorBuilder.java  |   51 +-
 .../TestColumnFamilyDescriptorLowerCaseEnum.java   |    4 +-
 .../hbase/client/TestConnectionConfiguration.java  |    4 +-
 .../hbase/client/TestConnectionFactoryTracing.java |    2 +
 .../TestConnectionImplementationTracing.java       |    1 +
 .../hbase/client/TestConnectionRegistryLeak.java   |    4 +-
 .../hbase/client/TestCoprocessorDescriptor.java    |   17 +-
 .../hadoop/hbase/client/TestDelayingRunner.java    |   13 +-
 .../hadoop/hbase/client/TestDeleteTimeStamp.java   |    9 +-
 .../org/apache/hadoop/hbase/client/TestGet.java    |   84 +-
 .../client/TestHTableMultiplexerViaMocks.java      |   10 +-
 .../hadoop/hbase/client/TestHTableTracing.java     |  130 +-
 .../client/TestImmutableHColumnDescriptor.java     |   49 +-
 .../hbase/client/TestImmutableHRegionInfo.java     |   14 +-
 .../client/TestImmutableHTableDescriptor.java      |   58 +-
 .../hadoop/hbase/client/TestImmutableScan.java     |   64 +-
 .../apache/hadoop/hbase/client/TestIncrement.java  |   16 +-
 .../hadoop/hbase/client/TestInterfaceAlign.java    |    2 +-
 .../hadoop/hbase/client/TestMetricsConnection.java |  103 +-
 .../apache/hadoop/hbase/client/TestMutation.java   |  102 +-
 .../apache/hadoop/hbase/client/TestOperation.java  |  308 +--
 .../hadoop/hbase/client/TestProcedureFuture.java   |   50 +-
 .../apache/hadoop/hbase/client/TestPutDotHas.java  |    9 +-
 .../hadoop/hbase/client/TestPutWriteToWal.java     |   13 +-
 .../hadoop/hbase/client/TestRegionInfoBuilder.java |    4 +-
 .../hadoop/hbase/client/TestRegionInfoDisplay.java |   67 +-
 .../hbase/client/TestRegionLocatorTracing.java     |   51 +-
 .../hadoop/hbase/client/TestResultStatsUtil.java   |   23 +-
 .../TestRetriesExhaustedWithDetailsException.java  |   11 +-
 .../hbase/client/TestReversedScannerCallable.java  |   20 +-
 .../hadoop/hbase/client/TestRowComparator.java     |   13 +-
 .../client/TestRpcBasedRegistryHedgedReads.java    |    5 +-
 .../hbase/client/TestRpcRetryingCallerImpl.java    |    8 +-
 .../org/apache/hadoop/hbase/client/TestScan.java   |   97 +-
 .../hadoop/hbase/client/TestScannerCallable.java   |   12 +-
 .../hbase/client/TestSimpleRequestController.java  |   53 +-
 .../hbase/client/TestTableDescriptorBuilder.java   |  185 +-
 .../hbase/client/TestTableDescriptorUtils.java     |   33 +-
 .../hadoop/hbase/client/TestTableRpcPriority.java  |   31 +-
 .../hadoop/hbase/client/TestTracingBase.java       |   30 +-
 .../hbase/client/trace/StringTraceRenderer.java    |   31 +-
 .../client/trace/hamcrest/AttributesMatchers.java  |   41 +-
 .../hbase/client/trace/hamcrest/EventMatchers.java |   14 +-
 .../client/trace/hamcrest/SpanDataMatchers.java    |   20 +-
 .../hbase/client/trace/hamcrest/TraceTestUtil.java |   22 +-
 .../hbase/exceptions/TestClientExceptionsUtil.java |    4 +-
 .../hadoop/hbase/filter/TestComparators.java       |   58 +-
 .../hadoop/hbase/filter/TestKeyOnlyFilter.java     |   35 +-
 .../hadoop/hbase/filter/TestLongComparator.java    |   10 +-
 .../hadoop/hbase/ipc/TestCellBlockBuilder.java     |   30 +-
 .../apache/hadoop/hbase/ipc/TestConnectionId.java  |   25 +-
 .../hadoop/hbase/ipc/TestFailedServersLog.java     |    6 +-
 .../hbase/ipc/TestHBaseRpcControllerImpl.java      |    4 +-
 .../org/apache/hadoop/hbase/ipc/TestIPCUtil.java   |   23 +-
 .../hadoop/hbase/ipc/TestNettyRpcConnection.java   |    2 +-
 .../hbase/ipc/TestRemoteWithExtrasException.java   |   14 +-
 .../ipc/TestRpcClientDeprecatedNameMapping.java    |    4 +-
 .../hadoop/hbase/quotas/TestQuotaFilter.java       |   21 +-
 .../quotas/TestQuotaGlobalsSettingsBypass.java     |   37 +-
 .../hbase/quotas/TestQuotaSettingsFactory.java     |   52 +-
 .../hbase/quotas/TestSpaceLimitSettings.java       |   24 +-
 .../hadoop/hbase/quotas/TestThrottleSettings.java  |   38 +-
 .../replication/TestReplicationPeerConfig.java     |  140 +-
 .../hadoop/hbase/security/TestEncryptionUtil.java  |   23 +-
 .../hbase/security/TestHBaseSaslRpcClient.java     |  124 +-
 .../apache/hadoop/hbase/security/TestSaslUtil.java |    6 +-
 .../provider/TestDefaultProviderSelector.java      |   12 +-
 .../TestSaslClientAuthenticationProviders.java     |   61 +-
 .../hbase/security/token/TestClientTokenUtil.java  |    6 +-
 .../hbase/shaded/protobuf/TestProtobufUtil.java    |  173 +-
 .../apache/hadoop/hbase/util/BuilderStyleTest.java |   39 +-
 .../apache/hadoop/hbase/util/PoolMapTestBase.java  |   10 +-
 .../hadoop/hbase/util/TestRoundRobinPoolMap.java   |    4 +-
 .../hadoop/hbase/util/TestThreadLocalPoolMap.java  |    4 +-
 .../hadoop/hbase/zookeeper/TestZNodePaths.java     |    4 +-
 hbase-common/pom.xml                               |  233 +-
 .../org/apache/hadoop/hbase/ArrayBackedTag.java    |   30 +-
 .../java/org/apache/hadoop/hbase/AuthUtil.java     |   92 +-
 .../org/apache/hadoop/hbase/BaseConfigurable.java  |    9 +-
 .../hadoop/hbase/ByteBufferExtendedCell.java       |   67 +-
 .../hadoop/hbase/ByteBufferKeyOnlyKeyValue.java    |   24 +-
 .../apache/hadoop/hbase/ByteBufferKeyValue.java    |   24 +-
 .../org/apache/hadoop/hbase/ByteBufferTag.java     |   12 +-
 .../main/java/org/apache/hadoop/hbase/Cell.java    |   60 +-
 .../java/org/apache/hadoop/hbase/CellBuilder.java  |    8 +-
 .../apache/hadoop/hbase/CellBuilderFactory.java    |   14 +-
 .../org/apache/hadoop/hbase/CellBuilderType.java   |    9 +-
 .../org/apache/hadoop/hbase/CellComparator.java    |   52 +-
 .../apache/hadoop/hbase/CellComparatorImpl.java    |  185 +-
 .../org/apache/hadoop/hbase/CellScannable.java     |   11 +-
 .../java/org/apache/hadoop/hbase/CellScanner.java  |   10 +-
 .../java/org/apache/hadoop/hbase/CellUtil.java     |  503 ++--
 .../java/org/apache/hadoop/hbase/ChoreService.java |   45 +-
 .../apache/hadoop/hbase/CompoundConfiguration.java |  125 +-
 .../java/org/apache/hadoop/hbase/ExtendedCell.java |   22 +-
 .../apache/hadoop/hbase/ExtendedCellBuilder.java   |   15 +-
 .../hadoop/hbase/ExtendedCellBuilderFactory.java   |    4 +-
 .../hadoop/hbase/ExtendedCellBuilderImpl.java      |    1 -
 .../apache/hadoop/hbase/HBaseConfiguration.java    |  161 +-
 .../org/apache/hadoop/hbase/HBaseIOException.java  |    7 +-
 .../hadoop/hbase/HBaseInterfaceAudience.java       |    9 +-
 .../java/org/apache/hadoop/hbase/HConstants.java   |  595 ++---
 .../hadoop/hbase/IndividualBytesFieldCell.java     |  112 +-
 .../hbase/IndividualBytesFieldCellBuilder.java     |    9 +-
 .../JitterScheduledThreadPoolExecutorImpl.java     |   34 +-
 .../java/org/apache/hadoop/hbase/KeyValue.java     | 1187 ++++-----
 .../org/apache/hadoop/hbase/KeyValueBuilder.java   |   10 +-
 .../org/apache/hadoop/hbase/KeyValueTestUtil.java  |   73 +-
 .../java/org/apache/hadoop/hbase/KeyValueUtil.java |  387 ++-
 .../apache/hadoop/hbase/MetaCellComparator.java    |   20 +-
 .../hadoop/hbase/MetaMutationAnnotation.java       |   11 +-
 .../apache/hadoop/hbase/NamespaceDescriptor.java   |   50 +-
 .../hadoop/hbase/NoTagsByteBufferKeyValue.java     |    3 +-
 .../org/apache/hadoop/hbase/NoTagsKeyValue.java    |    5 +-
 .../org/apache/hadoop/hbase/PrivateCellUtil.java   |  641 ++---
 .../main/java/org/apache/hadoop/hbase/RawCell.java |    3 +-
 .../org/apache/hadoop/hbase/RawCellBuilder.java    |   11 +-
 .../apache/hadoop/hbase/RawCellBuilderFactory.java |    8 +-
 .../org/apache/hadoop/hbase/ScheduledChore.java    |   56 +-
 .../java/org/apache/hadoop/hbase/ServerName.java   |  145 +-
 .../hadoop/hbase/ServiceNotRunningException.java   |   18 +
 .../hadoop/hbase/SizeCachedByteBufferKeyValue.java |   11 +-
 .../apache/hadoop/hbase/SizeCachedKeyValue.java    |   18 +-
 .../hbase/SizeCachedNoTagsByteBufferKeyValue.java  |   13 +-
 .../hadoop/hbase/SizeCachedNoTagsKeyValue.java     |   13 +-
 .../java/org/apache/hadoop/hbase/Stoppable.java    |    6 +-
 .../java/org/apache/hadoop/hbase/TableName.java    |  261 +-
 .../src/main/java/org/apache/hadoop/hbase/Tag.java |   26 +-
 .../java/org/apache/hadoop/hbase/TagBuilder.java   |    9 +-
 .../org/apache/hadoop/hbase/TagBuilderFactory.java |    7 +-
 .../main/java/org/apache/hadoop/hbase/TagType.java |    6 +-
 .../main/java/org/apache/hadoop/hbase/TagUtil.java |   19 +-
 .../org/apache/hadoop/hbase/backup/BackupType.java |    7 +-
 .../org/apache/hadoop/hbase/codec/BaseDecoder.java |   16 +-
 .../org/apache/hadoop/hbase/codec/BaseEncoder.java |    6 +-
 .../org/apache/hadoop/hbase/codec/CellCodec.java   |   49 +-
 .../hadoop/hbase/codec/CellCodecWithTags.java      |   34 +-
 .../java/org/apache/hadoop/hbase/codec/Codec.java  |   29 +-
 .../apache/hadoop/hbase/codec/CodecException.java  |    3 +-
 .../apache/hadoop/hbase/codec/KeyValueCodec.java   |   17 +-
 .../hadoop/hbase/codec/KeyValueCodecWithTags.java  |   18 +-
 .../hadoop/hbase/conf/ConfigurationManager.java    |   72 +-
 .../hadoop/hbase/conf/ConfigurationObserver.java   |    9 +-
 .../conf/PropagatingConfigurationObserver.java     |    9 +-
 .../hbase/exceptions/DeserializationException.java |    2 +-
 .../hadoop/hbase/exceptions/HBaseException.java    |    2 +-
 .../exceptions/IllegalArgumentIOException.java     |    4 +-
 .../hbase/exceptions/TimeoutIOException.java       |    4 +-
 .../hbase/exceptions/UnexpectedStateException.java |    2 +-
 .../hadoop/hbase/filter/ByteArrayComparable.java   |   42 +-
 .../hbase/io/BoundedDelegatingInputStream.java     |   19 +-
 .../hadoop/hbase/io/ByteArrayOutputStream.java     |    5 +-
 .../apache/hadoop/hbase/io/ByteBuffAllocator.java  |   36 +-
 .../hadoop/hbase/io/ByteBuffInputStream.java       |   13 +-
 .../hadoop/hbase/io/ByteBufferInputStream.java     |    9 +-
 .../hbase/io/ByteBufferListOutputStream.java       |    8 +-
 .../hadoop/hbase/io/ByteBufferOutputStream.java    |   45 +-
 .../apache/hadoop/hbase/io/ByteBufferWriter.java   |    6 +-
 .../hbase/io/ByteBufferWriterDataOutputStream.java |    6 +-
 .../hbase/io/ByteBufferWriterOutputStream.java     |   35 +-
 .../apache/hadoop/hbase/io/CellOutputStream.java   |   27 +-
 .../io/DeallocateRewriteByteBuffAllocator.java     |   10 +-
 .../hadoop/hbase/io/DelegatingInputStream.java     |   22 +-
 .../java/org/apache/hadoop/hbase/io/HeapSize.java  |   21 +-
 .../hadoop/hbase/io/ImmutableBytesWritable.java    |  102 +-
 .../apache/hadoop/hbase/io/SizedCellScanner.java   |   11 +-
 .../hadoop/hbase/io/TagCompressionContext.java     |   50 +-
 .../java/org/apache/hadoop/hbase/io/TimeRange.java |   42 +-
 .../apache/hadoop/hbase/io/compress/CanReinit.java |   27 +-
 .../hadoop/hbase/io/compress/Compression.java      |  172 +-
 .../hadoop/hbase/io/compress/CompressionUtil.java  |   40 +-
 .../hadoop/hbase/io/compress/DictionaryCache.java  |   68 +-
 .../hbase/io/compress/ReusableStreamGzipCodec.java |   55 +-
 .../org/apache/hadoop/hbase/io/crypto/Cipher.java  |   54 +-
 .../hadoop/hbase/io/crypto/CipherProvider.java     |   26 +-
 .../org/apache/hadoop/hbase/io/crypto/Context.java |   32 +-
 .../hbase/io/crypto/CryptoCipherProvider.java      |   30 +-
 .../apache/hadoop/hbase/io/crypto/Decryptor.java   |   12 +-
 .../hbase/io/crypto/DefaultCipherProvider.java     |   30 +-
 .../apache/hadoop/hbase/io/crypto/Encryption.java  |  313 +--
 .../apache/hadoop/hbase/io/crypto/Encryptor.java   |   12 +-
 .../apache/hadoop/hbase/io/crypto/KeyProvider.java |   42 +-
 .../hbase/io/crypto/KeyStoreKeyProvider.java       |   68 +-
 .../org/apache/hadoop/hbase/io/crypto/aes/AES.java |   10 +-
 .../hadoop/hbase/io/crypto/aes/AESDecryptor.java   |    3 +-
 .../hadoop/hbase/io/crypto/aes/AESEncryptor.java   |    3 +-
 .../hbase/io/crypto/aes/CommonsCryptoAES.java      |   20 +-
 .../io/crypto/aes/CommonsCryptoAESDecryptor.java   |    6 +-
 .../io/crypto/aes/CommonsCryptoAESEncryptor.java   |    6 +-
 .../hadoop/hbase/io/crypto/aes/CryptoAES.java      |   46 +-
 .../io/encoding/AbstractDataBlockEncoder.java      |   35 +-
 .../io/encoding/BufferedDataBlockEncoder.java      |  256 +-
 .../hadoop/hbase/io/encoding/CompressionState.java |   65 +-
 .../hbase/io/encoding/CopyKeyDataBlockEncoder.java |   49 +-
 .../hadoop/hbase/io/encoding/DataBlockEncoder.java |  103 +-
 .../hbase/io/encoding/DataBlockEncoding.java       |   69 +-
 .../hbase/io/encoding/DiffKeyDeltaEncoder.java     |  143 +-
 .../hadoop/hbase/io/encoding/EncodedDataBlock.java |  104 +-
 .../encoding/EncoderBufferTooSmallException.java   |   23 +-
 .../hadoop/hbase/io/encoding/EncodingState.java    |    2 +-
 .../hbase/io/encoding/FastDiffDeltaEncoder.java    |  231 +-
 .../io/encoding/HFileBlockDecodingContext.java     |   55 +-
 .../encoding/HFileBlockDefaultDecodingContext.java |   39 +-
 .../encoding/HFileBlockDefaultEncodingContext.java |   65 +-
 .../io/encoding/HFileBlockEncodingContext.java     |   44 +-
 .../hadoop/hbase/io/encoding/NoneEncoder.java      |    5 +-
 .../hbase/io/encoding/PrefixKeyDeltaEncoder.java   |   74 +-
 .../hadoop/hbase/io/encoding/RowIndexCodecV1.java  |   70 +-
 .../hbase/io/encoding/RowIndexEncoderV1.java       |   32 +-
 .../hadoop/hbase/io/encoding/RowIndexSeekerV1.java |   72 +-
 .../io/hadoopbackport/ThrottledInputStream.java    |   45 +-
 .../apache/hadoop/hbase/io/hfile/BlockType.java    |   56 +-
 .../apache/hadoop/hbase/io/hfile/HFileContext.java |   73 +-
 .../hadoop/hbase/io/hfile/HFileContextBuilder.java |   15 +-
 .../apache/hadoop/hbase/io/util/BlockIOUtils.java  |   76 +-
 .../apache/hadoop/hbase/io/util/Dictionary.java    |   50 +-
 .../apache/hadoop/hbase/io/util/LRUDictionary.java |   41 +-
 .../apache/hadoop/hbase/io/util/StreamUtils.java   |   16 +-
 .../org/apache/hadoop/hbase/log/HBaseMarkers.java  |    3 +-
 .../java/org/apache/hadoop/hbase/net/Address.java  |   27 +-
 .../java/org/apache/hadoop/hbase/nio/ByteBuff.java |  241 +-
 .../hadoop/hbase/nio/HBaseReferenceCounted.java    |    2 +-
 .../org/apache/hadoop/hbase/nio/MultiByteBuff.java |  193 +-
 .../java/org/apache/hadoop/hbase/nio/RefCnt.java   |    2 +-
 .../apache/hadoop/hbase/nio/SingleByteBuff.java    |    4 +-
 .../apache/hadoop/hbase/rsgroup/RSGroupInfo.java   |   13 +-
 .../hadoop/hbase/security/SecurityConstants.java   |   15 +-
 .../apache/hadoop/hbase/security/Superusers.java   |   30 +-
 .../org/apache/hadoop/hbase/security/User.java     |  155 +-
 .../apache/hadoop/hbase/security/UserProvider.java |  110 +-
 .../hbase/trace/HBaseSemanticAttributes.java       |   18 +-
 .../org/apache/hadoop/hbase/trace/TraceUtil.java   |   33 +-
 .../hadoop/hbase/types/CopyOnWriteArrayMap.java    |   88 +-
 .../org/apache/hadoop/hbase/types/DataType.java    |   68 +-
 .../hadoop/hbase/types/FixedLengthWrapper.java     |   27 +-
 .../org/apache/hadoop/hbase/types/OrderedBlob.java |    8 +-
 .../apache/hadoop/hbase/types/OrderedBlobVar.java  |    6 +-
 .../hadoop/hbase/types/OrderedBytesBase.java       |    5 +-
 .../apache/hadoop/hbase/types/OrderedFloat32.java  |    2 +-
 .../apache/hadoop/hbase/types/OrderedFloat64.java  |    2 +-
 .../apache/hadoop/hbase/types/OrderedInt16.java    |    2 +-
 .../apache/hadoop/hbase/types/OrderedInt32.java    |    2 +-
 .../apache/hadoop/hbase/types/OrderedInt64.java    |    2 +-
 .../org/apache/hadoop/hbase/types/OrderedInt8.java |    2 +-
 .../apache/hadoop/hbase/types/OrderedNumeric.java  |   14 +-
 .../apache/hadoop/hbase/types/OrderedString.java   |    2 +-
 .../java/org/apache/hadoop/hbase/types/PBType.java |   21 +-
 .../org/apache/hadoop/hbase/types/RawByte.java     |    6 +-
 .../org/apache/hadoop/hbase/types/RawBytes.java    |    9 +-
 .../hadoop/hbase/types/RawBytesFixedLength.java    |   14 +-
 .../hadoop/hbase/types/RawBytesTerminated.java     |   17 +-
 .../org/apache/hadoop/hbase/types/RawDouble.java   |    6 +-
 .../org/apache/hadoop/hbase/types/RawFloat.java    |    6 +-
 .../org/apache/hadoop/hbase/types/RawInteger.java  |    6 +-
 .../org/apache/hadoop/hbase/types/RawLong.java     |    6 +-
 .../org/apache/hadoop/hbase/types/RawShort.java    |    6 +-
 .../org/apache/hadoop/hbase/types/RawString.java   |    9 +-
 .../hadoop/hbase/types/RawStringFixedLength.java   |   10 +-
 .../hadoop/hbase/types/RawStringTerminated.java    |   15 +-
 .../java/org/apache/hadoop/hbase/types/Struct.java |   54 +-
 .../apache/hadoop/hbase/types/StructBuilder.java   |    6 +-
 .../apache/hadoop/hbase/types/StructIterator.java  |   38 +-
 .../hadoop/hbase/types/TerminatedWrapper.java      |   20 +-
 .../java/org/apache/hadoop/hbase/types/Union2.java |   10 +-
 .../java/org/apache/hadoop/hbase/types/Union3.java |   10 +-
 .../java/org/apache/hadoop/hbase/types/Union4.java |   10 +-
 .../hadoop/hbase/util/AbstractByteRange.java       |   48 +-
 .../hadoop/hbase/util/AbstractHBaseTool.java       |   58 +-
 .../hbase/util/AbstractPositionedByteRange.java    |   40 +-
 .../org/apache/hadoop/hbase/util/Addressing.java   |   40 +-
 .../org/apache/hadoop/hbase/util/AtomicUtils.java  |    3 +-
 .../java/org/apache/hadoop/hbase/util/AvlUtil.java |  168 +-
 .../hbase/util/BoundedCompletionService.java       |   19 +-
 .../apache/hadoop/hbase/util/ByteArrayHashKey.java |    2 +-
 .../hadoop/hbase/util/ByteBufferAllocator.java     |    3 +-
 .../apache/hadoop/hbase/util/ByteBufferArray.java  |   46 +-
 .../apache/hadoop/hbase/util/ByteBufferUtils.java  |  329 ++-
 .../org/apache/hadoop/hbase/util/ByteRange.java    |  158 +-
 .../apache/hadoop/hbase/util/ByteRangeUtils.java   |    3 +-
 .../java/org/apache/hadoop/hbase/util/Bytes.java   | 1069 ++++----
 .../org/apache/hadoop/hbase/util/CellHashKey.java  |    2 +-
 .../org/apache/hadoop/hbase/util/ChecksumType.java |   35 +-
 .../apache/hadoop/hbase/util/ClassLoaderBase.java  |   10 +-
 .../org/apache/hadoop/hbase/util/ClassSize.java    |  173 +-
 .../java/org/apache/hadoop/hbase/util/Classes.java |   19 +-
 .../apache/hadoop/hbase/util/CollectionUtils.java  |    5 +-
 .../apache/hadoop/hbase/util/CommonFSUtils.java    |  274 +-
 .../hadoop/hbase/util/ConcatenatedLists.java       |   21 +-
 .../hadoop/hbase/util/ConcurrentMapUtils.java      |    8 +-
 .../hadoop/hbase/util/CoprocessorClassLoader.java  |  156 +-
 .../java/org/apache/hadoop/hbase/util/Counter.java |   48 +-
 .../java/org/apache/hadoop/hbase/util/DNS.java     |   49 +-
 .../hadoop/hbase/util/DefaultEnvironmentEdge.java  |    1 -
 .../hadoop/hbase/util/DynamicClassLoader.java      |   74 +-
 .../apache/hadoop/hbase/util/EnvironmentEdge.java  |    7 +-
 .../hadoop/hbase/util/EnvironmentEdgeManager.java  |   86 +-
 .../apache/hadoop/hbase/util/ExceptionUtil.java    |   15 +-
 .../hbase/util/ExponentialMovingAverage.java       |    1 -
 .../org/apache/hadoop/hbase/util/FutureUtils.java  |   10 +-
 .../org/apache/hadoop/hbase/util/GsonUtil.java     |    2 +-
 .../java/org/apache/hadoop/hbase/util/Hash.java    |   17 +-
 .../java/org/apache/hadoop/hbase/util/HashKey.java |    6 +-
 .../java/org/apache/hadoop/hbase/util/IdLock.java  |   39 +-
 .../hadoop/hbase/util/ImmutableByteArray.java      |    2 +-
 .../hbase/util/IncrementingEnvironmentEdge.java    |    5 +-
 .../org/apache/hadoop/hbase/util/JRubyFormat.java  |   29 +-
 .../java/org/apache/hadoop/hbase/util/JVM.java     |   88 +-
 .../org/apache/hadoop/hbase/util/JenkinsHash.java  |  291 +-
 .../org/apache/hadoop/hbase/util/KeyLocker.java    |   43 +-
 .../java/org/apache/hadoop/hbase/util/MD5Hash.java |   27 +-
 .../java/org/apache/hadoop/hbase/util/Methods.java |   26 +-
 .../apache/hadoop/hbase/util/MovingAverage.java    |    4 +-
 .../org/apache/hadoop/hbase/util/MurmurHash.java   |   15 +-
 .../org/apache/hadoop/hbase/util/MurmurHash3.java  |   48 +-
 .../org/apache/hadoop/hbase/util/NonceKey.java     |   13 +-
 .../apache/hadoop/hbase/util/ObjectIntPair.java    |    8 +-
 .../org/apache/hadoop/hbase/util/ObjectPool.java   |   62 +-
 .../java/org/apache/hadoop/hbase/util/Order.java   |   13 +-
 .../org/apache/hadoop/hbase/util/OrderedBytes.java |  849 +++---
 .../java/org/apache/hadoop/hbase/util/Pair.java    |   67 +-
 .../apache/hadoop/hbase/util/PairOfSameType.java   |   27 +-
 .../hadoop/hbase/util/PositionedByteRange.java     |   46 +-
 .../apache/hadoop/hbase/util/PrettyPrinter.java    |  109 +-
 .../org/apache/hadoop/hbase/util/Random64.java     |   44 +-
 .../apache/hadoop/hbase/util/ReflectionUtils.java  |   82 +-
 .../apache/hadoop/hbase/util/ReservoirSample.java  |    2 +-
 .../org/apache/hadoop/hbase/util/RetryCounter.java |   28 +-
 .../hadoop/hbase/util/RetryCounterFactory.java     |   10 +-
 .../apache/hadoop/hbase/util/RowBloomHashKey.java  |    2 +-
 .../hadoop/hbase/util/RowColBloomHashKey.java      |    4 +-
 .../apache/hadoop/hbase/util/SimpleByteRange.java  |   12 +-
 .../hadoop/hbase/util/SimpleMovingAverage.java     |    1 -
 .../hadoop/hbase/util/SimpleMutableByteRange.java  |   70 +-
 .../hbase/util/SimplePositionedByteRange.java      |   34 +-
 .../util/SimplePositionedMutableByteRange.java     |  111 +-
 .../java/org/apache/hadoop/hbase/util/Sleeper.java |   35 +-
 .../apache/hadoop/hbase/util/SoftObjectPool.java   |   16 +-
 .../java/org/apache/hadoop/hbase/util/Strings.java |   44 +-
 .../java/org/apache/hadoop/hbase/util/Threads.java |   62 +-
 .../apache/hadoop/hbase/util/TimeMeasurable.java   |    8 +-
 .../java/org/apache/hadoop/hbase/util/Triple.java  |    4 +-
 .../org/apache/hadoop/hbase/util/UnsafeAccess.java |   67 +-
 .../org/apache/hadoop/hbase/util/VersionInfo.java  |   27 +-
 .../apache/hadoop/hbase/util/WeakObjectPool.java   |   21 +-
 .../hadoop/hbase/util/WeightedMovingAverage.java   |    6 +-
 .../hadoop/hbase/util/WindowMovingAverage.java     |   14 +-
 .../apache/hadoop/hbase/zookeeper/ZKConfig.java    |  119 +-
 hbase-common/src/main/resources/hbase-default.xml  |    4 +-
 hbase-common/src/saveVersion.sh                    |    1 -
 .../java/org/apache/hadoop/hbase/ClassFinder.java  |   63 +-
 .../org/apache/hadoop/hbase/ClassTestFinder.java   |   23 +-
 .../apache/hadoop/hbase/HBaseClassTestRule.java    |   28 +-
 .../hadoop/hbase/HBaseClassTestRuleChecker.java    |   16 +-
 .../hadoop/hbase/HBaseCommonTestingUtility.java    |   53 +-
 .../org/apache/hadoop/hbase/MatcherPredicate.java  |   13 +-
 .../org/apache/hadoop/hbase/ResourceChecker.java   |   35 +-
 .../hadoop/hbase/ResourceCheckerJUnitListener.java |   16 +-
 .../org/apache/hadoop/hbase/SystemExitRule.java    |    7 +-
 .../org/apache/hadoop/hbase/TableNameTestRule.java |    4 +-
 .../hadoop/hbase/TestByteBufferKeyValue.java       |  155 +-
 .../org/apache/hadoop/hbase/TestCellBuilder.java   |   84 +-
 .../apache/hadoop/hbase/TestCellComparator.java    |  127 +-
 .../java/org/apache/hadoop/hbase/TestCellUtil.java |  103 +-
 .../org/apache/hadoop/hbase/TestChoreService.java  |    4 +-
 .../org/apache/hadoop/hbase/TestClassFinder.java   |   74 +-
 .../hadoop/hbase/TestCompoundConfiguration.java    |   36 +-
 .../hadoop/hbase/TestHBaseClassTestRule.java       |   28 +-
 .../hadoop/hbase/TestHBaseConfiguration.java       |  150 +-
 .../hadoop/hbase/TestIndividualBytesFieldCell.java |  171 +-
 .../java/org/apache/hadoop/hbase/TestKeyValue.java |  239 +-
 .../org/apache/hadoop/hbase/TestServerName.java    |   16 +-
 .../apache/hadoop/hbase/TestSystemExitInTest.java  |    7 +-
 .../org/apache/hadoop/hbase/TestTableName.java     |   57 +-
 .../org/apache/hadoop/hbase/TestTagBuilder.java    |   15 +-
 .../java/org/apache/hadoop/hbase/TestTagUtil.java  |    4 +-
 .../java/org/apache/hadoop/hbase/TestTimeout.java  |   16 +-
 .../apache/hadoop/hbase/TimedOutTestsListener.java |   38 +-
 .../test/java/org/apache/hadoop/hbase/Waiter.java  |   44 +-
 .../apache/hadoop/hbase/codec/TestCellCodec.java   |   15 +-
 .../hadoop/hbase/codec/TestCellCodecWithTags.java  |   27 +-
 .../hadoop/hbase/codec/TestKeyValueCodec.java      |   23 +-
 .../hbase/codec/TestKeyValueCodecWithTags.java     |   27 +-
 .../hbase/conf/TestConfigurationManager.java       |    9 +-
 .../hadoop/hbase/io/TestByteBuffAllocator.java     |    6 +-
 .../hbase/io/TestByteBufferListOutputStream.java   |    4 +-
 .../hbase/io/TestMultiByteBuffInputStream.java     |    4 +-
 .../hadoop/hbase/io/TestTagCompressionContext.java |   46 +-
 .../hbase/io/compress/CompressionTestBase.java     |   86 +-
 .../hbase/io/crypto/KeyProviderForTesting.java     |   26 +-
 .../hadoop/hbase/io/crypto/TestCipherProvider.java |   18 +-
 .../hadoop/hbase/io/crypto/TestEncryption.java     |   40 +-
 .../hadoop/hbase/io/crypto/TestKeyProvider.java    |    6 +-
 .../hbase/io/crypto/TestKeyStoreKeyProvider.java   |   13 +-
 .../apache/hadoop/hbase/io/crypto/aes/TestAES.java |    8 +-
 .../hadoop/hbase/io/crypto/aes/TestCommonsAES.java |    7 +-
 .../hadoopbackport/TestThrottledInputStream.java   |    6 +-
 .../hadoop/hbase/io/util/TestLRUDictionary.java    |   45 +-
 .../apache/hadoop/hbase/logging/TestJul2Slf4j.java |    4 +-
 .../hadoop/hbase/logging/TestLog4jUtils.java       |    2 +-
 .../apache/hadoop/hbase/net/BoundSocketMaker.java  |   13 +-
 .../org/apache/hadoop/hbase/net/TestAddress.java   |   14 +-
 .../apache/hadoop/hbase/nio/TestMultiByteBuff.java |   23 +-
 .../hadoop/hbase/nio/TestSingleByteBuff.java       |    4 +-
 .../hadoop/hbase/types/TestCopyOnWriteMaps.java    |   42 +-
 .../hadoop/hbase/types/TestFixedLengthWrapper.java |   18 +-
 .../apache/hadoop/hbase/types/TestOrderedBlob.java |   21 +-
 .../hadoop/hbase/types/TestOrderedBlobVar.java     |   22 +-
 .../hadoop/hbase/types/TestOrderedString.java      |   19 +-
 .../apache/hadoop/hbase/types/TestRawString.java   |   14 +-
 .../org/apache/hadoop/hbase/types/TestStruct.java  |  126 +-
 .../hbase/types/TestStructNullExtension.java       |   27 +-
 .../hadoop/hbase/types/TestTerminatedWrapper.java  |   21 +-
 .../org/apache/hadoop/hbase/types/TestUnion2.java  |   19 +-
 .../hadoop/hbase/util/AbstractHBaseToolTest.java   |   36 +-
 .../hadoop/hbase/util/ClassLoaderTestHelper.java   |   79 +-
 .../util/EnvironmentEdgeManagerTestHelper.java     |    7 +-
 .../hadoop/hbase/util/LoadTestKVGenerator.java     |   74 +-
 .../hbase/util/NonRepeatedEnvironmentEdge.java     |    2 +-
 .../hadoop/hbase/util/RandomDistribution.java      |  105 +-
 .../hadoop/hbase/util/RedundantKVGenerator.java    |  145 +-
 .../hadoop/hbase/util/SimpleKdcServerUtil.java     |   25 +-
 .../org/apache/hadoop/hbase/util/TestAvlUtil.java  |   14 +-
 .../hadoop/hbase/util/TestByteBufferArray.java     |    6 +-
 .../hadoop/hbase/util/TestByteBufferUtils.java     |  123 +-
 .../hadoop/hbase/util/TestByteRangeUtils.java      |   46 +-
 .../util/TestByteRangeWithKVSerialization.java     |   19 +-
 .../org/apache/hadoop/hbase/util/TestBytes.java    |  134 +-
 .../org/apache/hadoop/hbase/util/TestClasses.java  |    8 +-
 .../hadoop/hbase/util/TestCommonFSUtils.java       |   13 +-
 .../hadoop/hbase/util/TestConcatenatedLists.java   |   10 +-
 .../hbase/util/TestCoprocessorClassLoader.java     |   36 +-
 .../org/apache/hadoop/hbase/util/TestCounter.java  |   26 +-
 .../hadoop/hbase/util/TestDynamicClassLoader.java  |   18 +-
 .../hbase/util/TestEnvironmentEdgeManager.java     |    9 +-
 .../apache/hadoop/hbase/util/TestFutureUtils.java  |    2 +-
 .../org/apache/hadoop/hbase/util/TestGsonUtil.java |    5 +-
 .../apache/hadoop/hbase/util/TestJRubyFormat.java  |    7 +-
 .../apache/hadoop/hbase/util/TestKeyLocker.java    |    8 +-
 .../hadoop/hbase/util/TestLoadTestKVGenerator.java |    8 +-
 .../hadoop/hbase/util/TestMovingAverage.java       |    7 +-
 .../org/apache/hadoop/hbase/util/TestOrder.java    |    7 +-
 .../apache/hadoop/hbase/util/TestOrderedBytes.java |  327 +--
 .../hadoop/hbase/util/TestReservoirSample.java     |    2 +-
 .../apache/hadoop/hbase/util/TestRetryCounter.java |   14 +-
 .../hadoop/hbase/util/TestShowProperties.java      |   10 +-
 .../hadoop/hbase/util/TestSimpleKdcServerUtil.java |    9 +-
 .../hbase/util/TestSimpleMutableByteRange.java     |   30 +-
 .../util/TestSimplePositionedMutableByteRange.java |    6 +-
 .../org/apache/hadoop/hbase/util/TestThreads.java  |   17 +-
 .../apache/hadoop/hbase/util/TestVersionInfo.java  |    4 +-
 .../hadoop/hbase/util/TestWeakObjectPool.java      |   23 +-
 .../hbase/util/TimeOffsetEnvironmentEdge.java      |    7 +-
 .../hadoop/hbase/zookeeper/TestZKConfig.java       |   27 +-
 .../hbase-compression-aircompressor/pom.xml        |   72 +-
 .../compress/aircompressor/HadoopCompressor.java   |   31 +-
 .../compress/aircompressor/HadoopDecompressor.java |   31 +-
 .../hbase/io/compress/aircompressor/Lz4Codec.java  |   33 +-
 .../hbase/io/compress/aircompressor/LzoCodec.java  |   33 +-
 .../io/compress/aircompressor/SnappyCodec.java     |   33 +-
 .../hbase/io/compress/aircompressor/ZstdCodec.java |   48 +-
 .../aircompressor/TestHFileCompressionLz4.java     |    6 +-
 .../aircompressor/TestHFileCompressionLzo.java     |    6 +-
 .../aircompressor/TestHFileCompressionSnappy.java  |    6 +-
 .../aircompressor/TestHFileCompressionZstd.java    |    6 +-
 .../io/compress/aircompressor/TestLz4Codec.java    |   27 +-
 .../io/compress/aircompressor/TestLzoCodec.java    |   27 +-
 .../io/compress/aircompressor/TestSnappyCodec.java |   27 +-
 .../aircompressor/TestWALCompressionLz4.java       |    4 +-
 .../aircompressor/TestWALCompressionLzo.java       |    4 +-
 .../aircompressor/TestWALCompressionSnappy.java    |    4 +-
 .../aircompressor/TestWALCompressionZstd.java      |    4 +-
 .../io/compress/aircompressor/TestZstdCodec.java   |   27 +-
 hbase-compression/hbase-compression-brotli/pom.xml |   72 +-
 .../hbase/io/compress/brotli/BrotliCodec.java      |   27 +-
 .../hbase/io/compress/brotli/BrotliCompressor.java |   24 +-
 .../io/compress/brotli/BrotliDecompressor.java     |   24 +-
 .../hbase/io/compress/brotli/TestBrotliCodec.java  |   27 +-
 .../brotli/TestHFileCompressionBrotli.java         |    6 +-
 .../compress/brotli/TestWALCompressionBrotli.java  |    4 +-
 hbase-compression/hbase-compression-lz4/pom.xml    |   50 +-
 .../hadoop/hbase/io/compress/lz4/Lz4Codec.java     |   28 +-
 .../hbase/io/compress/lz4/Lz4Compressor.java       |   29 +-
 .../hbase/io/compress/lz4/Lz4Decompressor.java     |   29 +-
 .../io/compress/lz4/TestHFileCompressionLz4.java   |    6 +-
 .../hadoop/hbase/io/compress/lz4/TestLz4Codec.java |   29 +-
 .../io/compress/lz4/TestWALCompressionLz4.java     |    4 +-
 hbase-compression/hbase-compression-snappy/pom.xml |   50 +-
 .../hbase/io/compress/xerial/SnappyCodec.java      |   28 +-
 .../hbase/io/compress/xerial/SnappyCompressor.java |   25 +-
 .../io/compress/xerial/SnappyDecompressor.java     |   25 +-
 .../xerial/TestHFileCompressionSnappy.java         |    6 +-
 .../hbase/io/compress/xerial/TestSnappyCodec.java  |   27 +-
 .../compress/xerial/TestWALCompressionSnappy.java  |    4 +-
 hbase-compression/hbase-compression-xz/pom.xml     |   50 +-
 .../hadoop/hbase/io/compress/xz/LzmaCodec.java     |   28 +-
 .../hbase/io/compress/xz/LzmaCompressor.java       |   28 +-
 .../hbase/io/compress/xz/LzmaDecompressor.java     |   24 +-
 .../io/compress/xz/TestHFileCompressionLzma.java   |    6 +-
 .../hadoop/hbase/io/compress/xz/TestLzmaCodec.java |   29 +-
 .../io/compress/xz/TestWALCompressionLzma.java     |    4 +-
 hbase-compression/hbase-compression-zstd/pom.xml   |   50 +-
 .../hadoop/hbase/io/compress/zstd/ZstdCodec.java   |   38 +-
 .../hbase/io/compress/zstd/ZstdCompressor.java     |   29 +-
 .../hbase/io/compress/zstd/ZstdDecompressor.java   |   27 +-
 .../io/compress/zstd/TestHFileCompressionZstd.java |    6 +-
 .../io/compress/zstd/TestWALCompressionZstd.java   |    4 +-
 .../hbase/io/compress/zstd/TestZstdCodec.java      |   29 +-
 .../hbase/io/compress/zstd/TestZstdDictionary.java |   27 +-
 .../zstd/TestZstdDictionarySplitMerge.java         |   16 +-
 hbase-compression/pom.xml                          |    8 +-
 hbase-endpoint/pom.xml                             |   94 +-
 .../client/coprocessor/AggregationClient.java      |  677 +++--
 .../client/coprocessor/AggregationHelper.java      |   25 +-
 .../client/coprocessor/AsyncAggregationClient.java |  112 +-
 .../hbase/coprocessor/AggregateImplementation.java |  176 +-
 .../apache/hadoop/hbase/coprocessor/Export.java    |  174 +-
 .../security/access/SecureBulkLoadEndpoint.java    |   68 +-
 .../hbase/client/TestAsyncAggregationClient.java   |   41 +-
 .../hbase/client/TestRpcControllerFactory.java     |    8 +-
 .../coprocessor/ColumnAggregationEndpoint.java     |   10 +-
 .../ColumnAggregationEndpointNullResponse.java     |   23 +-
 .../ColumnAggregationEndpointWithErrors.java       |   18 +-
 .../coprocessor/ProtobufCoprocessorService.java    |   21 +-
 .../coprocessor/TestAsyncCoprocessorEndpoint.java  |   59 +-
 .../coprocessor/TestBatchCoprocessorEndpoint.java  |  116 +-
 .../hadoop/hbase/coprocessor/TestClassLoading.java |  195 +-
 .../hbase/coprocessor/TestCoprocessorEndpoint.java |  111 +-
 .../TestCoprocessorEndpointTracing.java            |  253 +-
 ...estCoprocessorServiceBackwardCompatibility.java |   36 +-
 .../coprocessor/TestCoprocessorTableEndpoint.java  |   25 +-
 .../hadoop/hbase/coprocessor/TestImportExport.java |    6 +-
 .../TestRegionServerCoprocessorEndpoint.java       |   41 +-
 .../coprocessor/TestRowProcessorEndpoint.java      |  134 +-
 .../hadoop/hbase/coprocessor/TestSecureExport.java |  175 +-
 .../hadoop/hbase/ipc/TestCoprocessorRpcUtils.java  |    8 +-
 .../regionserver/SecureBulkLoadEndpointClient.java |   62 +-
 ...HRegionServerBulkLoadWithOldSecureEndpoint.java |   48 +-
 .../regionserver/TestServerCustomProtocol.java     |  208 +-
 ...estReplicationSyncUpToolWithBulkLoadedData.java |   16 +-
 hbase-examples/README.txt                          |    2 +-
 hbase-examples/pom.xml                             |  112 +-
 .../hbase/client/example/AsyncClientExample.java   |   17 +-
 .../client/example/BufferedMutatorExample.java     |    8 +-
 .../client/example/ExportEndpointExample.java      |   16 +-
 .../hbase/client/example/HttpProxyExample.java     |   11 +-
 .../client/example/MultiThreadedClientExample.java |   79 +-
 .../hbase/client/example/RefreshHFilesClient.java  |   24 +-
 .../coprocessor/example/BulkDeleteEndpoint.java    |   27 +-
 .../example/DelegatingInternalScanner.java         |    2 +-
 .../example/ExampleMasterObserverWithMetrics.java  |   16 +-
 .../example/ExampleRegionObserverWithMetrics.java  |   38 +-
 .../coprocessor/example/RefreshHFilesEndpoint.java |   10 +-
 .../coprocessor/example/RowCountEndpoint.java      |   28 +-
 .../coprocessor/example/ScanModifyingObserver.java |   28 +-
 .../example/ValueRewritingObserver.java            |   34 +-
 .../example/WriteHeavyIncrementObserver.java       |   52 +-
 .../example/ZooKeeperScanPolicyObserver.java       |   39 +-
 .../hadoop/hbase/mapreduce/IndexBuilder.java       |   47 +-
 .../hadoop/hbase/mapreduce/SampleUploader.java     |   46 +-
 .../security/provider/example/SaslPlainServer.java |   32 +-
 .../provider/example/ShadeClientTokenUtil.java     |   12 +-
 .../provider/example/ShadeProviderSelector.java    |   20 +-
 .../example/ShadeSaslAuthenticationProvider.java   |   10 +-
 .../ShadeSaslClientAuthenticationProvider.java     |   17 +-
 .../ShadeSaslServerAuthenticationProvider.java     |   39 +-
 .../provider/example/ShadeTokenIdentifier.java     |    1 -
 .../org/apache/hadoop/hbase/thrift/DemoClient.java |  115 +-
 .../apache/hadoop/hbase/thrift/HttpDoAsClient.java |   54 +-
 .../apache/hadoop/hbase/thrift2/DemoClient.java    |   40 +-
 .../java/org/apache/hadoop/hbase/types/PBCell.java |    2 +-
 .../org/apache/hadoop/hbase/util/ClientUtils.java  |   19 +-
 .../src/main/python/thrift1/DemoClient.py          |    1 -
 .../src/main/python/thrift1/gen-py/hbase/Hbase.py  |    1 -
 .../python/thrift2/gen-py/hbase/THBaseService.py   |    1 -
 .../src/main/sh/healthcheck/healthcheck.sh         |   12 +-
 .../client/example/TestAsyncClientExample.java     |    4 +-
 .../hbase/client/example/TestHttpProxyExample.java |   10 +-
 .../client/example/TestRefreshHFilesClient.java    |    4 +-
 .../coprocessor/example/TestRefreshHFilesBase.java |    8 +-
 .../example/TestRefreshHFilesEndpoint.java         |   15 +-
 .../example/TestScanModifyingObserver.java         |   18 +-
 .../example/TestValueReplacingCompaction.java      |   18 +-
 .../example/TestWriteHeavyIncrementObserver.java   |   10 +-
 ...avyIncrementObserverWithMemStoreCompaction.java |   16 +-
 .../example/TestZooKeeperScanPolicyObserver.java   |   20 +-
 .../WriteHeavyIncrementObserverTestBase.java       |    5 +-
 .../hbase/mapreduce/TestMapReduceExamples.java     |   20 +-
 .../TestShadeSaslAuthenticationProvider.java       |   72 +-
 .../org/apache/hadoop/hbase/types/TestPBCell.java  |   11 +-
 hbase-external-blockcache/pom.xml                  |   79 +-
 .../hadoop/hbase/io/hfile/MemcachedBlockCache.java |   75 +-
 hbase-hadoop-compat/pom.xml                        |   65 +-
 .../apache/hadoop/hbase/CompatibilityFactory.java  |   14 +-
 .../hbase/CompatibilitySingletonFactory.java       |   19 +-
 .../apache/hadoop/hbase/io/MetricsIOSource.java    |   19 +-
 .../apache/hadoop/hbase/io/MetricsIOWrapper.java   |    3 +-
 .../hadoop/hbase/ipc/MetricsHBaseServerSource.java |   51 +-
 .../hbase/ipc/MetricsHBaseServerSourceFactory.java |   14 +-
 .../hbase/ipc/MetricsHBaseServerWrapper.java       |    4 +-
 .../master/MetricsAssignmentManagerSource.java     |   24 +-
 .../master/MetricsMasterFileSystemSource.java      |    4 +-
 .../hbase/master/MetricsMasterProcSource.java      |    3 +-
 .../master/MetricsMasterProcSourceFactory.java     |    3 +-
 .../hbase/master/MetricsMasterQuotaSource.java     |   46 +-
 .../master/MetricsMasterQuotaSourceFactory.java    |   15 +-
 .../hadoop/hbase/master/MetricsMasterSource.java   |    7 +-
 .../hbase/master/MetricsMasterSourceFactory.java   |    3 +-
 .../hadoop/hbase/master/MetricsMasterWrapper.java  |   20 +-
 .../hadoop/hbase/master/MetricsSnapshotSource.java |    3 +-
 .../master/balancer/MetricsBalancerSource.java     |    5 +-
 .../balancer/MetricsStochasticBalancerSource.java  |   12 +-
 .../apache/hadoop/hbase/metrics/BaseSource.java    |   30 +-
 .../hbase/metrics/ExceptionTrackingSource.java     |   40 +-
 .../hbase/metrics/JvmPauseMonitorSource.java       |    9 +-
 .../apache/hadoop/hbase/metrics/MBeanSource.java   |   12 +-
 .../hadoop/hbase/metrics/OperationMetrics.java     |    7 +-
 .../MetricsHeapMemoryManagerSource.java            |   37 +-
 .../regionserver/MetricsRegionAggregateSource.java |    9 +-
 .../MetricsRegionServerQuotaSource.java            |   32 +-
 .../regionserver/MetricsRegionServerSource.java    |  198 +-
 .../MetricsRegionServerSourceFactory.java          |   10 +-
 .../regionserver/MetricsRegionServerWrapper.java   |   26 +-
 .../hbase/regionserver/MetricsRegionSource.java    |   12 +-
 .../hbase/regionserver/MetricsRegionWrapper.java   |   44 +-
 .../regionserver/MetricsTableAggregateSource.java  |    8 +-
 .../hbase/regionserver/MetricsTableLatencies.java  |   48 +-
 .../hbase/regionserver/MetricsTableQueryMeter.java |   19 +-
 .../hbase/regionserver/MetricsTableSource.java     |   13 +-
 .../regionserver/MetricsTableWrapperAggregate.java |   15 +-
 .../regionserver/MetricsUserAggregateSource.java   |   10 +-
 .../hbase/regionserver/MetricsUserSource.java      |   11 +-
 .../hbase/regionserver/wal/MetricsWALSource.java   |   13 +-
 .../regionserver/MetricsReplicationSinkSource.java |   10 +-
 .../regionserver/MetricsReplicationSource.java     |    3 +-
 .../MetricsReplicationSourceFactory.java           |    6 +-
 .../MetricsReplicationSourceSource.java            |   39 +-
 .../MetricsReplicationTableSource.java             |    7 +-
 .../hadoop/hbase/rest/MetricsRESTSource.java       |   19 +-
 .../hbase/thrift/MetricsThriftServerSource.java    |    6 +-
 .../thrift/MetricsThriftServerSourceFactory.java   |    7 +-
 .../hbase/zookeeper/MetricsZooKeeperSource.java    |   11 +-
 .../apache/hadoop/metrics2/MetricHistogram.java    |   12 +-
 .../apache/hadoop/metrics2/MetricsExecutor.java    |    3 +-
 .../java/org/apache/hadoop/hbase/HadoopShims.java  |   12 +-
 .../apache/hadoop/hbase/RandomStringGenerator.java |    3 +-
 .../hadoop/hbase/RandomStringGeneratorImpl.java    |    8 +-
 .../hbase/TestCompatibilitySingletonFactory.java   |   13 +-
 .../master/TestMetricsMasterSourceFactory.java     |   12 +-
 .../TestMetricsRegionServerSourceFactory.java      |   12 +-
 .../regionserver/wal/TestMetricsWALSource.java     |   10 +-
 .../TestMetricsReplicationSourceFactory.java       |   12 +-
 .../hadoop/hbase/rest/TestMetricsRESTSource.java   |   12 +-
 .../hadoop/hbase/test/MetricsAssertHelper.java     |   81 +-
 .../TestMetricsThriftServerSourceFactory.java      |   11 +-
 .../zookeeper/TestMetricsZooKeeperSource.java      |   10 +-
 hbase-hadoop2-compat/pom.xml                       |  134 +-
 .../hadoop/hbase/io/MetricsIOSourceImpl.java       |   22 +-
 .../ipc/MetricsHBaseServerSourceFactoryImpl.java   |   21 +-
 .../hbase/ipc/MetricsHBaseServerSourceImpl.java    |  127 +-
 .../org/apache/hadoop/hbase/mapreduce/JobUtil.java |   13 +-
 .../master/MetricsAssignmentManagerSourceImpl.java |   33 +-
 .../master/MetricsMasterFilesystemSourceImpl.java  |   18 +-
 .../master/MetricsMasterProcSourceFactoryImpl.java |    3 +-
 .../hbase/master/MetricsMasterProcSourceImpl.java  |   31 +-
 .../MetricsMasterQuotaSourceFactoryImpl.java       |   15 +-
 .../hbase/master/MetricsMasterQuotaSourceImpl.java |   65 +-
 .../master/MetricsMasterSourceFactoryImpl.java     |    6 +-
 .../hbase/master/MetricsMasterSourceImpl.java      |   95 +-
 .../hbase/master/MetricsSnapshotSourceImpl.java    |   19 +-
 .../master/balancer/MetricsBalancerSourceImpl.java |   10 +-
 .../MetricsStochasticBalancerSourceImpl.java       |   24 +-
 .../hadoop/hbase/metrics/BaseSourceImpl.java       |   50 +-
 .../hbase/metrics/ExceptionTrackingSourceImpl.java |   65 +-
 .../org/apache/hadoop/hbase/metrics/Interns.java   |   34 +-
 .../hadoop/hbase/metrics/MBeanSourceImpl.java      |    6 +-
 .../hadoop/hbase/metrics/MetricsInfoImpl.java      |   26 +-
 .../impl/GlobalMetricRegistriesAdapter.java        |   22 +-
 .../impl/HBaseMetrics2HadoopMetricsAdapter.java    |   59 +-
 .../MetricsHeapMemoryManagerSourceImpl.java        |   78 +-
 .../MetricsRegionAggregateSourceImpl.java          |   25 +-
 .../MetricsRegionServerQuotaSourceImpl.java        |   22 +-
 .../MetricsRegionServerSourceFactoryImpl.java      |   11 +-
 .../MetricsRegionServerSourceImpl.java             |  556 ++--
 .../regionserver/MetricsRegionSourceImpl.java      |  176 +-
 .../MetricsTableAggregateSourceImpl.java           |   19 +-
 .../regionserver/MetricsTableLatenciesImpl.java    |   28 +-
 .../regionserver/MetricsTableQueryMeterImpl.java   |   24 +-
 .../hbase/regionserver/MetricsTableSourceImpl.java |  117 +-
 .../MetricsUserAggregateSourceImpl.java            |   12 +-
 .../hbase/regionserver/MetricsUserSourceImpl.java  |   38 +-
 .../regionserver/wal/MetricsWALSourceImpl.java     |   48 +-
 .../MetricsReplicationGlobalSourceSourceImpl.java  |   71 +-
 .../MetricsReplicationSinkSourceImpl.java          |   17 +-
 .../MetricsReplicationSourceFactoryImpl.java       |   13 +-
 .../regionserver/MetricsReplicationSourceImpl.java |   18 +-
 .../MetricsReplicationSourceSourceImpl.java        |   60 +-
 .../MetricsReplicationTableSourceImpl.java         |    5 +-
 .../hadoop/hbase/rest/MetricsRESTSourceImpl.java   |   22 +-
 .../MetricsThriftServerSourceFactoryImpl.java      |   12 +-
 .../thrift/MetricsThriftServerSourceImpl.java      |   26 +-
 .../zookeeper/MetricsZooKeeperSourceImpl.java      |   68 +-
 .../hadoop/metrics2/impl/JmxCacheBuster.java       |   17 +-
 .../metrics2/lib/DefaultMetricsSystemHelper.java   |   11 +-
 .../metrics2/lib/DynamicMetricsRegistry.java       |  240 +-
 .../hadoop/metrics2/lib/MetricsExecutorImpl.java   |   14 +-
 .../hadoop/metrics2/lib/MutableFastCounter.java    |    4 +-
 .../hadoop/metrics2/lib/MutableHistogram.java      |   30 +-
 .../hadoop/metrics2/lib/MutableRangeHistogram.java |   22 +-
 .../hadoop/metrics2/lib/MutableSizeHistogram.java  |    6 +-
 .../hadoop/metrics2/lib/MutableTimeHistogram.java  |    3 +-
 .../hadoop/metrics2/util/MetricQuantile.java       |    8 +-
 .../metrics2/util/MetricSampleQuantiles.java       |   78 +-
 .../org/apache/hadoop/hbase/HadoopShimsImpl.java   |    9 +-
 .../master/TestMetricsMasterProcSourceImpl.java    |   14 +-
 .../hbase/master/TestMetricsMasterSourceImpl.java  |   14 +-
 .../hadoop/hbase/metrics/TestBaseSourceImpl.java   |    8 +-
 .../regionserver/MetricsTableWrapperStub.java      |    1 -
 .../TestMetricsRegionServerSourceImpl.java         |   12 +-
 .../regionserver/TestMetricsRegionSourceImpl.java  |    9 +-
 .../regionserver/TestMetricsTableSourceImpl.java   |   23 +-
 .../regionserver/TestMetricsUserSourceImpl.java    |   18 +-
 .../regionserver/wal/TestMetricsWALSourceImpl.java |   12 +-
 .../TestMetricsReplicationSourceFactoryImpl.java   |    8 +-
 .../TestMetricsReplicationSourceImpl.java          |    8 +-
 .../hbase/rest/TestMetricsRESTSourceImpl.java      |    8 +-
 .../hadoop/hbase/test/MetricsAssertHelperImpl.java |   14 +-
 .../TestMetricsThriftServerSourceFactoryImpl.java  |   20 +-
 .../zookeeper/TestMetricsZooKeeperSourceImpl.java  |    6 +-
 .../metrics2/lib/TestMutableRangeHistogram.java    |    8 +-
 hbase-hbtop/pom.xml                                |   24 +-
 .../java/org/apache/hadoop/hbase/hbtop/HBTop.java  |   12 +-
 .../java/org/apache/hadoop/hbase/hbtop/Record.java |   18 +-
 .../apache/hadoop/hbase/hbtop/RecordFilter.java    |   18 +-
 .../org/apache/hadoop/hbase/hbtop/field/Field.java |    9 +-
 .../apache/hadoop/hbase/hbtop/field/FieldInfo.java |   13 +-
 .../hadoop/hbase/hbtop/field/FieldValue.java       |   39 +-
 .../hadoop/hbase/hbtop/field/FieldValueType.java   |   10 +-
 .../hbase/hbtop/mode/ClientModeStrategy.java       |  105 +-
 .../hadoop/hbase/hbtop/mode/DrillDownInfo.java     |    9 +-
 .../org/apache/hadoop/hbase/hbtop/mode/Mode.java   |    7 +-
 .../hadoop/hbase/hbtop/mode/ModeStrategy.java      |    9 +-
 .../hadoop/hbase/hbtop/mode/ModeStrategyUtils.java |   19 +-
 .../hbase/hbtop/mode/NamespaceModeStrategy.java    |   25 +-
 .../hbase/hbtop/mode/RegionModeStrategy.java       |   61 +-
 .../hbase/hbtop/mode/RegionServerModeStrategy.java |   52 +-
 .../hbase/hbtop/mode/RequestCountPerSecond.java    |    3 +-
 .../hadoop/hbase/hbtop/mode/TableModeStrategy.java |   37 +-
 .../hadoop/hbase/hbtop/mode/UserModeStrategy.java  |   41 +-
 .../hbase/hbtop/screen/AbstractScreenView.java     |    3 +-
 .../apache/hadoop/hbase/hbtop/screen/Screen.java   |   11 +-
 .../hadoop/hbase/hbtop/screen/ScreenView.java      |   11 +-
 .../hbtop/screen/field/FieldScreenPresenter.java   |   12 +-
 .../hbase/hbtop/screen/field/FieldScreenView.java  |   17 +-
 .../hbtop/screen/help/CommandDescription.java      |    4 +-
 .../hbtop/screen/help/HelpScreenPresenter.java     |   39 +-
 .../hbase/hbtop/screen/help/HelpScreenView.java    |    7 +-
 .../hbtop/screen/mode/ModeScreenPresenter.java     |    3 +-
 .../hbase/hbtop/screen/mode/ModeScreenView.java    |   19 +-
 .../top/FilterDisplayModeScreenPresenter.java      |    3 +-
 .../screen/top/FilterDisplayModeScreenView.java    |    7 +-
 .../hadoop/hbase/hbtop/screen/top/Header.java      |    5 +-
 .../hbtop/screen/top/InputModeScreenPresenter.java |    3 +-
 .../hbtop/screen/top/InputModeScreenView.java      |    7 +-
 .../screen/top/MessageModeScreenPresenter.java     |    7 +-
 .../hbtop/screen/top/MessageModeScreenView.java    |    6 +-
 .../hadoop/hbase/hbtop/screen/top/Paging.java      |    3 +-
 .../hadoop/hbase/hbtop/screen/top/Summary.java     |    7 +-
 .../hbase/hbtop/screen/top/TopScreenModel.java     |   20 +-
 .../hbase/hbtop/screen/top/TopScreenPresenter.java |   25 +-
 .../hbase/hbtop/screen/top/TopScreenView.java      |   51 +-
 .../hadoop/hbase/hbtop/terminal/Attributes.java    |    3 +-
 .../apache/hadoop/hbase/hbtop/terminal/Color.java  |   12 +-
 .../hbase/hbtop/terminal/CursorPosition.java       |    3 +-
 .../hadoop/hbase/hbtop/terminal/KeyPress.java      |   12 +-
 .../hadoop/hbase/hbtop/terminal/Terminal.java      |   20 +-
 .../hbase/hbtop/terminal/TerminalPrinter.java      |    3 +-
 .../hadoop/hbase/hbtop/terminal/TerminalSize.java  |    3 +-
 .../hadoop/hbase/hbtop/terminal/impl/Cell.java     |    3 +-
 .../hbase/hbtop/terminal/impl/EscapeSequences.java |    3 +-
 .../hbtop/terminal/impl/KeyPressGenerator.java     |   24 +-
 .../hbase/hbtop/terminal/impl/ScreenBuffer.java    |    9 +-
 .../hbase/hbtop/terminal/impl/TerminalImpl.java    |   23 +-
 .../hbtop/terminal/impl/TerminalPrinterImpl.java   |    2 +-
 .../hbtop/terminal/impl/batch/BatchTerminal.java   |   10 +-
 .../terminal/impl/batch/BatchTerminalPrinter.java  |    2 +-
 .../org/apache/hadoop/hbase/hbtop/TestRecord.java  |   34 +-
 .../hadoop/hbase/hbtop/TestRecordFilter.java       |   33 +-
 .../org/apache/hadoop/hbase/hbtop/TestUtils.java   |  201 +-
 .../hadoop/hbase/hbtop/field/TestFieldValue.java   |   33 +-
 .../hadoop/hbase/hbtop/mode/TestClientMode.java    |   16 +-
 .../hadoop/hbase/hbtop/mode/TestModeBase.java      |   10 +-
 .../hadoop/hbase/hbtop/mode/TestNamespaceMode.java |    6 +-
 .../hadoop/hbase/hbtop/mode/TestRegionMode.java    |    3 +-
 .../hbase/hbtop/mode/TestRegionServerMode.java     |    3 +-
 .../hbtop/mode/TestRequestCountPerSecond.java      |    3 +-
 .../hadoop/hbase/hbtop/mode/TestTableMode.java     |    6 +-
 .../hadoop/hbase/hbtop/mode/TestUserMode.java      |    2 +-
 .../screen/field/TestFieldScreenPresenter.java     |   23 +-
 .../hbtop/screen/help/TestHelpScreenPresenter.java |    7 +-
 .../hbtop/screen/mode/TestModeScreenPresenter.java |    5 +-
 .../top/TestFilterDisplayModeScreenPresenter.java  |   20 +-
 .../screen/top/TestInputModeScreenPresenter.java   |    7 +-
 .../screen/top/TestMessageModeScreenPresenter.java |    7 +-
 .../hadoop/hbase/hbtop/screen/top/TestPaging.java  |    6 +-
 .../hbase/hbtop/screen/top/TestTopScreenModel.java |   14 +-
 .../hbtop/screen/top/TestTopScreenPresenter.java   |   51 +-
 .../hbase/hbtop/terminal/impl/TestCursor.java      |    4 +-
 .../hbase/hbtop/terminal/impl/TestKeyPress.java    |    4 +-
 .../hbtop/terminal/impl/TestTerminalPrinter.java   |    8 +-
 hbase-http/pom.xml                                 |  225 +-
 .../hadoop/hbase/http/AdminAuthorizedFilter.java   |   19 +-
 .../hadoop/hbase/http/AdminAuthorizedServlet.java  |    5 +-
 .../hbase/http/ClickjackingPreventionFilter.java   |   11 +-
 .../apache/hadoop/hbase/http/FilterContainer.java  |   15 +-
 .../hadoop/hbase/http/FilterInitializer.java       |    4 +-
 .../org/apache/hadoop/hbase/http/HtmlQuoting.java  |   42 +-
 .../org/apache/hadoop/hbase/http/HttpConfig.java   |    7 +-
 .../apache/hadoop/hbase/http/HttpRequestLog.java   |    2 +-
 .../org/apache/hadoop/hbase/http/HttpServer.java   |  577 ++--
 .../apache/hadoop/hbase/http/HttpServerUtil.java   |    9 +-
 .../org/apache/hadoop/hbase/http/InfoServer.java   |   90 +-
 .../apache/hadoop/hbase/http/NoCacheFilter.java    |    7 +-
 .../hadoop/hbase/http/ProfileOutputServlet.java    |    6 +-
 .../apache/hadoop/hbase/http/ProfileServlet.java   |  117 +-
 .../hbase/http/ProxyUserAuthenticationFilter.java  |   87 +-
 .../hadoop/hbase/http/SecurityHeadersFilter.java   |   17 +-
 .../hadoop/hbase/http/ServerConfigurationKeys.java |   11 +-
 .../apache/hadoop/hbase/http/conf/ConfServlet.java |   20 +-
 .../hbase/http/gson/ByteArraySerializer.java       |    1 +
 .../hbase/http/gson/GsonMessageBodyWriter.java     |   22 +-
 .../hbase/http/jersey/ResponseEntityMapper.java    |    7 +-
 .../hbase/http/jersey/SupplierFactoryAdapter.java  |    8 +-
 .../hadoop/hbase/http/jmx/JMXJsonServlet.java      |  112 +-
 .../hadoop/hbase/http/lib/StaticUserWebFilter.java |   33 +-
 .../org/apache/hadoop/hbase/http/log/LogLevel.java |  146 +-
 .../org/apache/hadoop/hbase/util/JSONBean.java     |   34 +-
 .../apache/hadoop/hbase/util/JSONMetricUtil.java   |   20 +-
 .../apache/hadoop/hbase/util/LogMonitoring.java    |    3 +-
 .../org/apache/hadoop/hbase/util/ProcessUtils.java |    5 +-
 .../hbase/http/HttpServerFunctionalTest.java       |  120 +-
 .../apache/hadoop/hbase/http/TestGlobalFilter.java |   31 +-
 .../apache/hadoop/hbase/http/TestHtmlQuoting.java  |   36 +-
 .../hadoop/hbase/http/TestHttpCookieFlag.java      |  102 +-
 .../hadoop/hbase/http/TestHttpRequestLog.java      |    2 +-
 .../apache/hadoop/hbase/http/TestHttpServer.java   |  202 +-
 .../hadoop/hbase/http/TestHttpServerLifecycle.java |   41 +-
 .../hadoop/hbase/http/TestHttpServerWebapps.java   |   10 +-
 .../apache/hadoop/hbase/http/TestPathFilter.java   |   27 +-
 .../hbase/http/TestProfileOutputServlet.java       |   11 +-
 .../hbase/http/TestProxyUserSpnegoHttpServer.java  |   95 +-
 .../hadoop/hbase/http/TestSSLHttpServer.java       |   32 +-
 .../hbase/http/TestSecurityHeadersFilter.java      |   43 +-
 .../hadoop/hbase/http/TestServletFilter.java       |   56 +-
 .../hadoop/hbase/http/TestSpnegoHttpServer.java    |   68 +-
 .../hadoop/hbase/http/conf/TestConfServlet.java    |   26 +-
 .../hadoop/hbase/http/jmx/TestJMXJsonServlet.java  |   72 +-
 .../hbase/http/lib/TestStaticUserWebFilter.java    |   15 +-
 .../apache/hadoop/hbase/http/log/TestLogLevel.java |   34 +-
 .../hadoop/hbase/http/resource/JerseyResource.java |   15 +-
 .../hadoop/hbase/http/ssl/KeyStoreTestUtil.java    |  273 +-
 .../org/apache/hadoop/hbase/util/TestJSONBean.java |   27 +-
 hbase-it/pom.xml                                   |  273 +-
 .../org/apache/hadoop/hbase/chaos/ChaosAgent.java  |  216 +-
 .../apache/hadoop/hbase/chaos/ChaosConstants.java  |   33 +-
 .../apache/hadoop/hbase/chaos/ChaosService.java    |   27 +-
 .../org/apache/hadoop/hbase/chaos/ChaosUtils.java  |    8 +-
 .../org/apache/hadoop/hbase/ChaosZKClient.java     |   92 +-
 .../org/apache/hadoop/hbase/ClusterManager.java    |   29 +-
 .../apache/hadoop/hbase/CoprocClusterManager.java  |   41 +-
 .../hadoop/hbase/DistributedHBaseCluster.java      |  134 +-
 .../apache/hadoop/hbase/HBaseClusterManager.java   |  133 +-
 .../hbase/IntegrationTestAcidGuarantees.java       |    9 +-
 .../apache/hadoop/hbase/IntegrationTestBase.java   |   44 +-
 .../hbase/IntegrationTestDDLMasterFailover.java    |  376 ++-
 .../apache/hadoop/hbase/IntegrationTestIngest.java |   70 +-
 .../IntegrationTestIngestStripeCompactions.java    |    8 +-
 .../hadoop/hbase/IntegrationTestIngestWithACL.java |   18 +-
 .../hbase/IntegrationTestIngestWithEncryption.java |   11 +-
 .../hadoop/hbase/IntegrationTestIngestWithMOB.java |   25 +-
 .../hbase/IntegrationTestIngestWithTags.java       |    5 +-
 .../IntegrationTestIngestWithVisibilityLabels.java |   17 +-
 .../hadoop/hbase/IntegrationTestLazyCfLoading.java |   44 +-
 .../hadoop/hbase/IntegrationTestManyRegions.java   |   51 +-
 .../hadoop/hbase/IntegrationTestMetaReplicas.java  |   25 +-
 .../hbase/IntegrationTestRegionReplicaPerf.java    |   91 +-
 .../IntegrationTestRegionReplicaReplication.java   |   61 +-
 .../hadoop/hbase/IntegrationTestingUtility.java    |   69 +-
 .../hadoop/hbase/IntegrationTestsDriver.java       |   31 +-
 .../org/apache/hadoop/hbase/MockHttpApiRule.java   |   31 +-
 .../apache/hadoop/hbase/RESTApiClusterManager.java |  261 +-
 .../hadoop/hbase/ShellExecEndpointCoprocessor.java |   57 +-
 .../StripeCompactionsPerformanceEvaluation.java    |   68 +-
 .../hadoop/hbase/TestIntegrationTestBase.java      |    4 +-
 .../hadoop/hbase/TestRESTApiClusterManager.java    |   51 +-
 .../hbase/TestShellExecEndpointCoprocessor.java    |   44 +-
 .../apache/hadoop/hbase/ZNodeClusterManager.java   |   28 +-
 .../apache/hadoop/hbase/chaos/actions/Action.java  |   89 +-
 .../hbase/chaos/actions/AddCPULoadAction.java      |   19 +-
 .../hbase/chaos/actions/AddColumnAction.java       |   17 +-
 .../hbase/chaos/actions/BatchRestartRsAction.java  |   23 +-
 .../chaos/actions/ChangeBloomFilterAction.java     |   11 +-
 .../chaos/actions/ChangeCompressionAction.java     |    8 +-
 .../hbase/chaos/actions/ChangeEncodingAction.java  |    6 +-
 .../chaos/actions/ChangeSplitPolicyAction.java     |   12 +-
 .../hbase/chaos/actions/ChangeVersionsAction.java  |   11 +-
 .../hbase/chaos/actions/CompactMobAction.java      |    4 +-
 .../actions/CompactRandomRegionOfTableAction.java  |   11 +-
 .../hbase/chaos/actions/CompactTableAction.java    |    7 +-
 .../chaos/actions/CorruptDataFilesAction.java      |   12 +-
 .../chaos/actions/CorruptPacketsCommandAction.java |   17 +-
 .../chaos/actions/DecreaseMaxHFileSizeAction.java  |   14 +-
 .../chaos/actions/DelayPacketsCommandAction.java   |   18 +-
 .../hbase/chaos/actions/DeleteDataFilesAction.java |   12 +-
 .../chaos/actions/DumpClusterStatusAction.java     |   26 +-
 .../actions/DuplicatePacketsCommandAction.java     |   17 +-
 .../hbase/chaos/actions/FillDiskCommandAction.java |   29 +-
 .../actions/FlushRandomRegionOfTableAction.java    |   16 +-
 .../hbase/chaos/actions/FlushTableAction.java      |    8 +-
 .../hbase/chaos/actions/ForceBalancerAction.java   |    8 +-
 .../actions/GracefulRollingRestartRsAction.java    |   14 +-
 .../chaos/actions/LosePacketsCommandAction.java    |   17 +-
 .../MergeRandomAdjacentRegionsOfTableAction.java   |    6 +-
 .../actions/MoveRandomRegionOfTableAction.java     |   15 +-
 .../chaos/actions/MoveRegionsOfTableAction.java    |   13 +-
 .../hbase/chaos/actions/RemoveColumnAction.java    |   17 +-
 .../chaos/actions/ReorderPacketsCommandAction.java |   23 +-
 .../chaos/actions/RestartActionBaseAction.java     |    7 +-
 .../chaos/actions/RestartActiveMasterAction.java   |    8 +-
 .../chaos/actions/RestartActiveNameNodeAction.java |   10 +-
 .../chaos/actions/RestartRandomDataNodeAction.java |   16 +-
 .../hbase/chaos/actions/RestartRandomRsAction.java |    4 +-
 .../actions/RestartRandomRsExceptMetaAction.java   |    4 +-
 .../chaos/actions/RestartRandomZKNodeAction.java   |   14 +-
 .../chaos/actions/RestartRsHoldingMetaAction.java  |   11 +-
 .../chaos/actions/RestartRsHoldingTableAction.java |   15 +-
 .../chaos/actions/RollingBatchRestartRsAction.java |   22 +-
 .../actions/RollingBatchSuspendResumeRsAction.java |   18 +-
 .../hbase/chaos/actions/SnapshotTableAction.java   |    8 +-
 .../chaos/actions/SplitAllRegionOfTableAction.java |    9 +-
 .../actions/SplitRandomRegionOfTableAction.java    |   14 +-
 .../hbase/chaos/actions/SudoCommandAction.java     |    9 +-
 .../hbase/chaos/actions/TCCommandAction.java       |    3 +-
 .../chaos/actions/TestChangeSplitPolicyAction.java |    6 +-
 .../hbase/chaos/actions/TruncateTableAction.java   |    4 +-
 .../actions/UnbalanceKillAndRebalanceAction.java   |   34 +-
 .../chaos/actions/UnbalanceRegionsAction.java      |   14 +-
 .../hbase/chaos/factories/CalmMonkeyFactory.java   |    4 +-
 ...ConfigurableSlowDeterministicMonkeyFactory.java |   45 +-
 .../chaos/factories/DataIssuesMonkeyFactory.java   |   35 +-
 .../factories/DistributedIssuesMonkeyFactory.java  |  109 +-
 .../factories/MasterKillingMonkeyFactory.java      |   32 +-
 .../chaos/factories/MobNoKillMonkeyFactory.java    |   31 +-
 .../MobSlowDeterministicMonkeyFactory.java         |  154 +-
 .../hbase/chaos/factories/MonkeyConstants.java     |    8 +-
 .../hbase/chaos/factories/MonkeyFactory.java       |   18 +-
 .../hbase/chaos/factories/NoKillMonkeyFactory.java |   59 +-
 .../ServerAndDependenciesKillingMonkeyFactory.java |   28 +-
 .../factories/ServerKillingMonkeyFactory.java      |   30 +-
 .../factories/SlowDeterministicMonkeyFactory.java  |  140 +-
 .../StressAssignmentManagerMonkeyFactory.java      |   77 +-
 .../chaos/factories/UnbalanceMonkeyFactory.java    |   45 +-
 .../hbase/chaos/monkies/CalmChaosMonkey.java       |    3 +-
 .../hadoop/hbase/chaos/monkies/ChaosMonkey.java    |   29 +-
 .../chaos/monkies/PolicyBasedChaosMonkey.java      |   23 +-
 .../chaos/policies/CompositeSequentialPolicy.java  |    2 +-
 .../hbase/chaos/policies/DoActionsOncePolicy.java  |    8 +-
 .../hbase/chaos/policies/PeriodicPolicy.java       |    5 +-
 .../chaos/policies/PeriodicRandomActionPolicy.java |    8 +-
 .../apache/hadoop/hbase/chaos/policies/Policy.java |    4 +-
 .../chaos/policies/TwoConcurrentActionPolicy.java  |   21 +-
 .../hadoop/hbase/chaos/util/ChaosMonkeyRunner.java |   44 +-
 .../apache/hadoop/hbase/chaos/util/Monkeys.java    |    8 +-
 .../hadoop/hbase/ipc/IntegrationTestRpcClient.java |   40 +-
 .../hbase/mapreduce/IntegrationTestBulkLoad.java   |  225 +-
 .../IntegrationTestFileBasedSFTBulkLoad.java       |   50 +-
 .../hbase/mapreduce/IntegrationTestImportTsv.java  |   75 +-
 .../IntegrationTestTableMapReduceUtil.java         |    9 +-
 .../IntegrationTestTableSnapshotInputFormat.java   |   79 +-
 .../hadoop/hbase/mttr/IntegrationTestMTTR.java     |  155 +-
 .../hbase/test/IntegrationTestBigLinkedList.java   |  595 ++---
 ...IntegrationTestBigLinkedListWithVisibility.java |  145 +-
 .../hbase/test/IntegrationTestLoadAndVerify.java   |  232 +-
 .../hbase/test/IntegrationTestLoadCommonCrawl.java |  215 +-
 .../hadoop/hbase/test/IntegrationTestMonkeys.java  |    7 +-
 .../hbase/test/IntegrationTestReplication.java     |  191 +-
 ...eBoundedMultiGetRequestsWithRegionReplicas.java |   32 +-
 ...nTestTimeBoundedRequestsWithRegionReplicas.java |  117 +-
 ...grationTestWithCellVisibilityLoadAndVerify.java |  100 +-
 .../test/IntegrationTestZKAndFSPermissions.java    |   42 +-
 .../org/apache/hadoop/hbase/test/util/CRC64.java   |    5 +-
 .../hbase/test/util/warc/WARCFileReader.java       |   50 +-
 .../hbase/test/util/warc/WARCFileWriter.java       |  128 +-
 .../hbase/test/util/warc/WARCInputFormat.java      |   49 +-
 .../hbase/test/util/warc/WARCOutputFormat.java     |   48 +-
 .../hadoop/hbase/test/util/warc/WARCRecord.java    |  269 +-
 .../hadoop/hbase/test/util/warc/WARCWritable.java  |   36 +-
 .../trace/IntegrationTestSendTraceRequests.java    |   15 +-
 hbase-logging/pom.xml                              |   68 +-
 .../hadoop/hbase/logging/InternalLog4jUtils.java   |    2 +-
 .../hbase/logging/JulToSlf4jInitializer.java       |    2 +-
 .../apache/hadoop/hbase/logging/Log4jUtils.java    |    2 +-
 .../hadoop/hbase/logging/HBaseTestAppender.java    |   10 +-
 .../org/apache/hadoop/hbase/logging/Target.java    |    2 +-
 .../test/java/org/apache/log4j/FileAppender.java   |    3 +-
 hbase-mapreduce/pom.xml                            |   89 +-
 .../org/apache/hadoop/hbase/mapred/Driver.java     |   13 +-
 .../hadoop/hbase/mapred/GroupingTableMap.java      |   92 +-
 .../hadoop/hbase/mapred/HRegionPartitioner.java    |   29 +-
 .../hadoop/hbase/mapred/IdentityTableMap.java      |   40 +-
 .../hadoop/hbase/mapred/IdentityTableReduce.java   |   31 +-
 .../mapred/MultiTableSnapshotInputFormat.java      |   72 +-
 .../org/apache/hadoop/hbase/mapred/RowCounter.java |   41 +-
 .../hadoop/hbase/mapred/TableInputFormat.java      |   20 +-
 .../hadoop/hbase/mapred/TableInputFormatBase.java  |  126 +-
 .../org/apache/hadoop/hbase/mapred/TableMap.java   |   12 +-
 .../hadoop/hbase/mapred/TableMapReduceUtil.java    |  286 +-
 .../hadoop/hbase/mapred/TableOutputFormat.java     |   34 +-
 .../hadoop/hbase/mapred/TableRecordReader.java     |   40 +-
 .../hadoop/hbase/mapred/TableRecordReaderImpl.java |   58 +-
 .../apache/hadoop/hbase/mapred/TableReduce.java    |    8 +-
 .../hbase/mapred/TableSnapshotInputFormat.java     |   57 +-
 .../org/apache/hadoop/hbase/mapred/TableSplit.java |   66 +-
 .../apache/hadoop/hbase/mapreduce/CellCounter.java |   95 +-
 .../apache/hadoop/hbase/mapreduce/CellCreator.java |  109 +-
 .../hadoop/hbase/mapreduce/CellSerialization.java  |    9 +-
 .../hadoop/hbase/mapreduce/CellSortReducer.java    |   18 +-
 .../apache/hadoop/hbase/mapreduce/CopyTable.java   |   81 +-
 .../DefaultVisibilityExpressionResolver.java       |   13 +-
 .../org/apache/hadoop/hbase/mapreduce/Driver.java  |   38 +-
 .../org/apache/hadoop/hbase/mapreduce/Export.java  |   56 +-
 .../apache/hadoop/hbase/mapreduce/ExportUtils.java |   48 +-
 .../hbase/mapreduce/GroupingTableMapper.java       |   91 +-
 .../hadoop/hbase/mapreduce/HFileInputFormat.java   |   20 +-
 .../hadoop/hbase/mapreduce/HFileOutputFormat2.java |  415 ++-
 .../hadoop/hbase/mapreduce/HRegionPartitioner.java |   79 +-
 .../apache/hadoop/hbase/mapreduce/HashTable.java   |   89 +-
 .../hbase/mapreduce/IdentityTableMapper.java       |   38 +-
 .../hbase/mapreduce/IdentityTableReducer.java      |   61 +-
 .../org/apache/hadoop/hbase/mapreduce/Import.java  |  330 ++-
 .../apache/hadoop/hbase/mapreduce/ImportTsv.java   |  271 +-
 .../apache/hadoop/hbase/mapreduce/JarFinder.java   |   59 +-
 .../hbase/mapreduce/KeyValueSerialization.java     |   14 +-
 .../hbase/mapreduce/KeyValueSortReducer.java       |   25 +-
 .../mapreduce/MultiTableHFileOutputFormat.java     |   72 +-
 .../hbase/mapreduce/MultiTableInputFormat.java     |   28 +-
 .../hbase/mapreduce/MultiTableInputFormatBase.java |  137 +-
 .../hbase/mapreduce/MultiTableOutputFormat.java    |   90 +-
 .../mapreduce/MultiTableSnapshotInputFormat.java   |   63 +-
 .../MultiTableSnapshotInputFormatImpl.java         |   66 +-
 .../hbase/mapreduce/MultithreadedTableMapper.java  |  131 +-
 .../hbase/mapreduce/MutationSerialization.java     |   13 +-
 .../apache/hadoop/hbase/mapreduce/PutCombiner.java |   24 +-
 .../hadoop/hbase/mapreduce/PutSortReducer.java     |   47 +-
 .../hbase/mapreduce/RegionSizeCalculator.java      |   28 +-
 .../hbase/mapreduce/ResultSerialization.java       |   14 +-
 .../mapreduce/RoundRobinTableInputFormat.java      |   44 +-
 .../apache/hadoop/hbase/mapreduce/RowCounter.java  |  174 +-
 .../mapreduce/SimpleTotalOrderPartitioner.java     |   54 +-
 .../apache/hadoop/hbase/mapreduce/SyncTable.java   |  230 +-
 .../hadoop/hbase/mapreduce/TableInputFormat.java   |   94 +-
 .../hbase/mapreduce/TableInputFormatBase.java      |  288 +-
 .../hadoop/hbase/mapreduce/TableMapReduceUtil.java |  850 +++---
 .../apache/hadoop/hbase/mapreduce/TableMapper.java |   15 +-
 .../hbase/mapreduce/TableOutputCommitter.java      |   10 +-
 .../hadoop/hbase/mapreduce/TableOutputFormat.java  |   93 +-
 .../hadoop/hbase/mapreduce/TableRecordReader.java  |   49 +-
 .../hbase/mapreduce/TableRecordReaderImpl.java     |  104 +-
 .../hadoop/hbase/mapreduce/TableReducer.java       |   29 +-
 .../hbase/mapreduce/TableSnapshotInputFormat.java  |  119 +-
 .../mapreduce/TableSnapshotInputFormatImpl.java    |  148 +-
 .../apache/hadoop/hbase/mapreduce/TableSplit.java  |  157 +-
 .../hadoop/hbase/mapreduce/TextSortReducer.java    |   63 +-
 .../hadoop/hbase/mapreduce/TsvImporterMapper.java  |   74 +-
 .../hbase/mapreduce/TsvImporterTextMapper.java     |   36 +-
 .../mapreduce/VisibilityExpressionResolver.java    |    5 +-
 .../hadoop/hbase/mapreduce/WALInputFormat.java     |   64 +-
 .../apache/hadoop/hbase/mapreduce/WALPlayer.java   |  119 +-
 .../mapreduce/replication/VerifyReplication.java   |  273 +-
 .../hadoop/hbase/mob/mapreduce/MobRefReporter.java |  126 +-
 .../hadoop/hbase/regionserver/CompactionTool.java  |  107 +-
 .../hadoop/hbase/snapshot/ExportSnapshot.java      |  357 +--
 .../util/MapreduceDependencyClasspathTool.java     |   16 +-
 .../apache/hadoop/hbase/PerformanceEvaluation.java |  641 +++--
 .../hadoop/hbase/ScanPerformanceEvaluation.java    |  158 +-
 .../hadoop/hbase/TestPerformanceEvaluation.java    |   24 +-
 .../org/apache/hadoop/hbase/mapred/TestDriver.java |    9 +-
 .../hadoop/hbase/mapred/TestGroupingTableMap.java  |   72 +-
 .../hadoop/hbase/mapred/TestIdentityTableMap.java  |   17 +-
 .../mapred/TestMultiTableSnapshotInputFormat.java  |   40 +-
 .../apache/hadoop/hbase/mapred/TestRowCounter.java |   45 +-
 .../apache/hadoop/hbase/mapred/TestSplitTable.java |   35 +-
 .../hadoop/hbase/mapred/TestTableInputFormat.java  |  116 +-
 .../hadoop/hbase/mapred/TestTableMapReduce.java    |   32 +-
 .../hbase/mapred/TestTableMapReduceUtil.java       |   90 +-
 .../TestTableOutputFormatConnectionExhaust.java    |   21 +-
 .../hbase/mapred/TestTableSnapshotInputFormat.java |   90 +-
 .../mapreduce/MultiTableInputFormatTestBase.java   |   84 +-
 .../hadoop/hbase/mapreduce/NMapInputFormat.java    |   20 +-
 .../TableSnapshotInputFormatTestBase.java          |   36 +-
 .../mapreduce/TestCellBasedHFileOutputFormat2.java |  562 ++--
 .../mapreduce/TestCellBasedImportExport2.java      |  347 +--
 .../hbase/mapreduce/TestCellBasedWALPlayer2.java   |   31 +-
 .../hadoop/hbase/mapreduce/TestCellCounter.java    |   31 +-
 .../hadoop/hbase/mapreduce/TestCopyTable.java      |   84 +-
 .../hbase/mapreduce/TestGroupingTableMapper.java   |   16 +-
 .../hbase/mapreduce/TestHBaseMRTestingUtility.java |   35 +-
 .../hbase/mapreduce/TestHFileOutputFormat2.java    |  585 ++---
 .../hbase/mapreduce/TestHRegionPartitioner.java    |   10 +-
 .../hadoop/hbase/mapreduce/TestHashTable.java      |   68 +-
 .../hadoop/hbase/mapreduce/TestImportExport.java   |  402 ++-
 .../TestImportTSVWithOperationAttributes.java      |   65 +-
 .../hbase/mapreduce/TestImportTSVWithTTLs.java     |   29 +-
 .../TestImportTSVWithVisibilityLabels.java         |  167 +-
 .../hadoop/hbase/mapreduce/TestImportTsv.java      |  199 +-
 .../hbase/mapreduce/TestImportTsvParser.java       |   22 +-
 .../hadoop/hbase/mapreduce/TestJarFinder.java      |   26 +-
 .../hbase/mapreduce/TestMultiTableInputFormat.java |   19 +-
 .../mapreduce/TestMultiTableInputFormatBase.java   |   89 +-
 .../TestMultiTableSnapshotInputFormat.java         |   12 +-
 .../TestMultiTableSnapshotInputFormatImpl.java     |   34 +-
 .../mapreduce/TestMultithreadedTableMapper.java    |  111 +-
 .../hbase/mapreduce/TestRegionSizeCalculator.java  |   52 +-
 .../mapreduce/TestRoundRobinTableInputFormat.java  |   55 +-
 .../hadoop/hbase/mapreduce/TestRowCounter.java     |  286 +-
 .../mapreduce/TestSimpleTotalOrderPartitioner.java |   15 +-
 .../hadoop/hbase/mapreduce/TestSyncTable.java      |  149 +-
 .../hbase/mapreduce/TestTableInputFormat.java      |  170 +-
 .../hbase/mapreduce/TestTableInputFormatBase.java  |   96 +-
 .../hbase/mapreduce/TestTableInputFormatScan.java  |    6 +-
 .../mapreduce/TestTableInputFormatScanBase.java    |   63 +-
 .../TestTableInputFormatScanEmptyToAPP.java        |    4 +-
 .../TestTableInputFormatScanEmptyToBBA.java        |    4 +-
 .../TestTableInputFormatScanEmptyToBBB.java        |    4 +-
 .../TestTableInputFormatScanEmptyToEmpty.java      |    4 +-
 .../TestTableInputFormatScanEmptyToOPP.java        |    4 +-
 .../TestTableInputFormatScanOBBToOPP.java          |    2 +-
 .../TestTableInputFormatScanOBBToQPP.java          |    2 +-
 .../TestTableInputFormatScanOPPToEmpty.java        |    4 +-
 .../TestTableInputFormatScanYYXToEmpty.java        |    4 +-
 .../TestTableInputFormatScanYYYToEmpty.java        |    4 +-
 .../TestTableInputFormatScanYZYToEmpty.java        |    4 +-
 .../hadoop/hbase/mapreduce/TestTableMapReduce.java |   57 +-
 .../hbase/mapreduce/TestTableMapReduceBase.java    |   61 +-
 .../hbase/mapreduce/TestTableMapReduceUtil.java    |   45 +-
 .../hbase/mapreduce/TestTableRecordReader.java     |   15 +-
 .../mapreduce/TestTableSnapshotInputFormat.java    |  146 +-
 .../hadoop/hbase/mapreduce/TestTableSplit.java     |   62 +-
 .../hbase/mapreduce/TestTimeRangeMapRed.java       |   51 +-
 .../hadoop/hbase/mapreduce/TestWALInputFormat.java |    3 +-
 .../hadoop/hbase/mapreduce/TestWALPlayer.java      |   35 +-
 .../hbase/mapreduce/TestWALRecordReader.java       |   61 +-
 .../mapreduce/TsvImporterCustomTestMapper.java     |   29 +-
 .../TsvImporterCustomTestMapperForOprAttr.java     |   14 +-
 .../hbase/regionserver/TestCompactionTool.java     |    8 +-
 .../hbase/replication/TestVerifyReplication.java   |   43 +-
 .../replication/TestVerifyReplicationAdjunct.java  |   24 +-
 .../TestVerifyReplicationCrossDiffHdfs.java        |   19 +-
 ...tVerifyReplicationSecureClusterCredentials.java |   35 +-
 .../hadoop/hbase/snapshot/TestExportSnapshot.java  |   74 +-
 .../hbase/snapshot/TestExportSnapshotAdjunct.java  |   36 +-
 .../hbase/snapshot/TestExportSnapshotHelpers.java  |   45 +-
 .../snapshot/TestExportSnapshotV1NoCluster.java    |   41 +-
 .../snapshot/TestExportSnapshotV2NoCluster.java    |   10 +-
 .../TestExportSnapshotWithTemporaryDirectory.java  |   14 +-
 .../hbase/snapshot/TestMobExportSnapshot.java      |    6 +-
 .../snapshot/TestMobSecureExportSnapshot.java      |    6 +-
 .../hbase/snapshot/TestSecureExportSnapshot.java   |    6 +-
 .../org/apache/hadoop/hbase/util/LoadTestTool.java |  286 +-
 hbase-mapreduce/src/test/resources/mapred-site.xml |    1 -
 hbase-metrics-api/README.txt                       |    2 +-
 hbase-metrics-api/pom.xml                          |   92 +-
 .../org/apache/hadoop/hbase/metrics/Counter.java   |    4 +-
 .../org/apache/hadoop/hbase/metrics/Gauge.java     |    3 +-
 .../org/apache/hadoop/hbase/metrics/Histogram.java |    4 +-
 .../org/apache/hadoop/hbase/metrics/Meter.java     |   14 +-
 .../org/apache/hadoop/hbase/metrics/Metric.java    |    2 +-
 .../hadoop/hbase/metrics/MetricRegistries.java     |   11 +-
 .../hbase/metrics/MetricRegistriesLoader.java      |   15 +-
 .../hadoop/hbase/metrics/MetricRegistry.java       |   12 +-
 .../hbase/metrics/MetricRegistryFactory.java       |    7 +-
 .../hadoop/hbase/metrics/MetricRegistryInfo.java   |   35 +-
 .../org/apache/hadoop/hbase/metrics/MetricSet.java |    6 +-
 .../apache/hadoop/hbase/metrics/PackageMarker.java |   19 +-
 .../org/apache/hadoop/hbase/metrics/Snapshot.java  |   19 +-
 .../org/apache/hadoop/hbase/metrics/Timer.java     |    5 +-
 .../hbase/metrics/TestMetricRegistriesLoader.java  |    8 +-
 hbase-metrics/README.txt                           |    2 +-
 hbase-metrics/pom.xml                              |   92 +-
 .../hadoop/hbase/metrics/impl/CounterImpl.java     |    3 +-
 .../hadoop/hbase/metrics/impl/DropwizardMeter.java |   10 +-
 .../hbase/metrics/impl/FastLongHistogram.java      |   16 +-
 .../hadoop/hbase/metrics/impl/HistogramImpl.java   |   10 +-
 .../hbase/metrics/impl/MetricRegistriesImpl.java   |    6 +-
 .../metrics/impl/MetricRegistryFactoryImpl.java    |    5 +-
 .../hbase/metrics/impl/MetricRegistryImpl.java     |    5 +-
 .../hadoop/hbase/metrics/impl/RefCountingMap.java  |   18 +-
 .../hadoop/hbase/metrics/impl/TimerImpl.java       |    3 +-
 .../hadoop/hbase/metrics/impl/TestCounterImpl.java |   10 +-
 .../hbase/metrics/impl/TestDropwizardMeter.java    |   10 +-
 .../hbase/metrics/impl/TestFastLongHistogram.java  |    9 +-
 .../hadoop/hbase/metrics/impl/TestGauge.java       |   12 +-
 .../hbase/metrics/impl/TestHistogramImpl.java      |    4 +-
 .../hbase/metrics/impl/TestMetricRegistryImpl.java |   15 +-
 .../hbase/metrics/impl/TestRefCountingMap.java     |    9 +-
 .../hadoop/hbase/metrics/impl/TestTimerImpl.java   |    4 +-
 hbase-procedure/pom.xml                            |   73 +-
 .../procedure2/AbstractProcedureScheduler.java     |   37 +-
 .../procedure2/CompletedProcedureCleaner.java      |    8 +-
 .../procedure2/CompletedProcedureRetainer.java     |    8 +-
 .../hadoop/hbase/procedure2/DelayedProcedure.java  |    4 +-
 .../hadoop/hbase/procedure2/FailedProcedure.java   |    6 +-
 .../procedure2/FailedRemoteDispatchException.java  |    3 +-
 .../hadoop/hbase/procedure2/InlineChore.java       |    2 +-
 .../hadoop/hbase/procedure2/LockAndQueue.java      |   13 +-
 .../apache/hadoop/hbase/procedure2/LockStatus.java |    3 +-
 .../apache/hadoop/hbase/procedure2/LockType.java   |    4 +-
 .../hadoop/hbase/procedure2/LockedResource.java    |    7 +-
 .../hbase/procedure2/LockedResourceType.java       |   10 +-
 .../hbase/procedure2/NoNodeDispatchException.java  |    5 +-
 .../procedure2/NoServerDispatchException.java      |    5 +-
 .../NullTargetServerDispatchException.java         |    6 +-
 .../hadoop/hbase/procedure2/OnePhaseProcedure.java |    3 +-
 .../apache/hadoop/hbase/procedure2/Procedure.java  |  227 +-
 .../procedure2/ProcedureAbortedException.java      |    3 +-
 .../hadoop/hbase/procedure2/ProcedureDeque.java    |   11 +-
 .../hadoop/hbase/procedure2/ProcedureEvent.java    |   40 +-
 .../hbase/procedure2/ProcedureException.java       |    2 +-
 .../hadoop/hbase/procedure2/ProcedureExecutor.java |  392 ++-
 .../hbase/procedure2/ProcedureInMemoryChore.java   |   20 +-
 .../hadoop/hbase/procedure2/ProcedureMetrics.java  |   12 +-
 .../hbase/procedure2/ProcedureScheduler.java       |   25 +-
 .../hbase/procedure2/ProcedureStateSerializer.java |    1 -
 .../procedure2/ProcedureSuspendedException.java    |    2 +-
 .../hadoop/hbase/procedure2/ProcedureUtil.java     |   68 +-
 .../hbase/procedure2/ProcedureYieldException.java  |    3 +-
 .../procedure2/RemoteProcedureDispatcher.java      |   77 +-
 .../hbase/procedure2/RemoteProcedureException.java |   27 +-
 .../hbase/procedure2/RootProcedureState.java       |   37 +-
 .../hbase/procedure2/SequentialProcedure.java      |   26 +-
 .../hbase/procedure2/SimpleProcedureScheduler.java |    6 +-
 .../hbase/procedure2/StateMachineProcedure.java    |   60 +-
 .../hadoop/hbase/procedure2/StoppableThread.java   |    2 +-
 .../hbase/procedure2/TimeoutExecutorThread.java    |    5 +-
 .../hadoop/hbase/procedure2/TwoPhaseProcedure.java |    3 +-
 .../store/InMemoryProcedureIterator.java           |    4 +-
 .../hbase/procedure2/store/LeaseRecovery.java      |    4 +-
 .../hbase/procedure2/store/NoopProcedureStore.java |    3 +-
 .../hbase/procedure2/store/ProcedureStore.java     |   55 +-
 .../hbase/procedure2/store/ProcedureStoreBase.java |    9 +-
 .../hbase/procedure2/store/ProcedureTree.java      |    6 +-
 .../hbase/procedure2/store/ProtoAndProcedure.java  |    4 +-
 .../hbase/procedure2/store/wal/BitSetNode.java     |    4 +-
 .../wal/CorruptedWALProcedureStoreException.java   |    2 +-
 .../store/wal/ProcedureStoreTracker.java           |   64 +-
 .../procedure2/store/wal/ProcedureWALFile.java     |   10 +-
 .../procedure2/store/wal/ProcedureWALFormat.java   |   73 +-
 .../store/wal/ProcedureWALFormatReader.java        |   13 +-
 .../store/wal/ProcedureWALPrettyPrinter.java       |   31 +-
 .../procedure2/store/wal/WALProcedureMap.java      |    4 +-
 .../procedure2/store/wal/WALProcedureStore.java    |  130 +-
 .../hadoop/hbase/procedure2/util/ByteSlot.java     |   13 +-
 .../hadoop/hbase/procedure2/util/DelayedUtil.java  |   12 +-
 .../hadoop/hbase/procedure2/util/StringUtils.java  |   17 +-
 .../hbase/procedure2/ProcedureTestingUtility.java  |    7 +-
 .../hbase/procedure2/TestChildProcedures.java      |   18 +-
 .../hbase/procedure2/TestForceUpdateProcedure.java |    8 +-
 .../hadoop/hbase/procedure2/TestLockAndQueue.java  |    2 +-
 .../hbase/procedure2/TestProcedureBypass.java      |   64 +-
 .../hbase/procedure2/TestProcedureCleanup.java     |    9 +-
 .../hbase/procedure2/TestProcedureEvents.java      |   53 +-
 .../hbase/procedure2/TestProcedureExecution.java   |    9 +-
 .../hbase/procedure2/TestProcedureExecutor.java    |   13 +-
 .../procedure2/TestProcedureInMemoryChore.java     |    6 +-
 .../hbase/procedure2/TestProcedureMetrics.java     |   12 +-
 .../hbase/procedure2/TestProcedureNonce.java       |   19 +-
 .../hbase/procedure2/TestProcedureRecovery.java    |   48 +-
 .../hbase/procedure2/TestProcedureReplayOrder.java |   26 +-
 .../procedure2/TestProcedureRollbackAIOOB.java     |    8 +-
 .../TestProcedureSchedulerConcurrency.java         |   14 +-
 .../procedure2/TestProcedureSkipPersistence.java   |    4 +-
 .../hbase/procedure2/TestProcedureSuspended.java   |   18 +-
 .../hbase/procedure2/TestProcedureToString.java    |   31 +-
 .../hadoop/hbase/procedure2/TestProcedureUtil.java |    7 +-
 ...rocedureDispatcherUncaughtExceptionHandler.java |    2 +-
 .../procedure2/TestStateMachineProcedure.java      |   26 +-
 .../hbase/procedure2/TestYieldProcedures.java      |   30 +-
 .../store/ProcedureStorePerformanceEvaluation.java |   37 +-
 .../hbase/procedure2/store/TestProcedureTree.java  |    4 +-
 .../ProcedureWALLoaderPerformanceEvaluation.java   |   61 +-
 .../wal/ProcedureWALPerformanceEvaluation.java     |    6 +-
 .../hbase/procedure2/store/wal/TestBitSetNode.java |    2 +-
 .../store/wal/TestProcedureStoreTracker.java       |    7 +-
 .../store/wal/TestStressWALProcedureStore.java     |   13 +-
 .../store/wal/TestWALProcedureStore.java           |  128 +-
 .../hbase/procedure2/util/TestDelayedUtil.java     |   17 +-
 hbase-protocol-shaded/pom.xml                      |   98 +-
 .../hadoop/hbase/util/ForeignExceptionUtil.java    |   26 +-
 hbase-protocol/pom.xml                             |   72 +-
 .../google/protobuf/HBaseZeroCopyByteString.java   |   22 +-
 .../org/apache/hadoop/hbase/util/ByteStringer.java |   18 +-
 hbase-replication/pom.xml                          |   57 +-
 .../hbase/replication/ReplicationFactory.java      |    2 +-
 .../hbase/replication/ReplicationListener.java     |    1 -
 .../hadoop/hbase/replication/ReplicationPeer.java  |    7 +-
 .../replication/ReplicationPeerConfigListener.java |    6 +-
 .../hbase/replication/ReplicationPeerImpl.java     |    6 +-
 .../hbase/replication/ReplicationPeerStorage.java  |    7 +-
 .../hadoop/hbase/replication/ReplicationPeers.java |    7 +-
 .../hbase/replication/ReplicationQueueInfo.java    |   59 +-
 .../hbase/replication/ReplicationQueueStorage.java |   51 +-
 .../replication/ReplicationStorageFactory.java     |    4 +-
 .../hadoop/hbase/replication/ReplicationUtils.java |   24 +-
 .../replication/ZKReplicationPeerStorage.java      |   19 +-
 .../replication/ZKReplicationQueueStorage.java     |  133 +-
 .../replication/ZKReplicationStorageBase.java      |    5 +-
 .../replication/TestReplicationStateBasic.java     |   24 +-
 .../replication/TestReplicationStateZKImpl.java    |   10 +-
 .../replication/TestZKReplicationPeerStorage.java  |   73 +-
 .../replication/TestZKReplicationQueueStorage.java |    6 +-
 hbase-resource-bundle/pom.xml                      |   16 +-
 hbase-rest/pom.xml                                 |  250 +-
 .../org/apache/hadoop/hbase/rest/Constants.java    |   13 +-
 .../apache/hadoop/hbase/rest/ExistsResource.java   |   20 +-
 .../org/apache/hadoop/hbase/rest/MetricsREST.java  |   18 +-
 .../apache/hadoop/hbase/rest/MultiRowResource.java |   27 +-
 .../hbase/rest/NamespacesInstanceResource.java     |  108 +-
 .../hadoop/hbase/rest/NamespacesResource.java      |   11 +-
 .../hadoop/hbase/rest/ProtobufMessageHandler.java  |   14 +-
 .../hadoop/hbase/rest/ProtobufStreamingOutput.java |   18 +-
 .../org/apache/hadoop/hbase/rest/RESTServer.java   |  117 +-
 .../org/apache/hadoop/hbase/rest/RESTServlet.java  |   40 +-
 .../hadoop/hbase/rest/RESTServletContainer.java    |   24 +-
 .../apache/hadoop/hbase/rest/RegionsResource.java  |   20 +-
 .../org/apache/hadoop/hbase/rest/ResourceBase.java |   51 +-
 .../apache/hadoop/hbase/rest/ResultGenerator.java  |    8 +-
 .../org/apache/hadoop/hbase/rest/RootResource.java |   17 +-
 .../org/apache/hadoop/hbase/rest/RowResource.java  |  363 +--
 .../hadoop/hbase/rest/RowResultGenerator.java      |   10 +-
 .../java/org/apache/hadoop/hbase/rest/RowSpec.java |  109 +-
 .../hadoop/hbase/rest/ScannerInstanceResource.java |   56 +-
 .../apache/hadoop/hbase/rest/ScannerResource.java  |   66 +-
 .../hadoop/hbase/rest/ScannerResultGenerator.java  |   29 +-
 .../apache/hadoop/hbase/rest/SchemaResource.java   |   75 +-
 .../hbase/rest/StorageClusterStatusResource.java   |   40 +-
 .../hbase/rest/StorageClusterVersionResource.java  |   18 +-
 .../apache/hadoop/hbase/rest/TableResource.java    |   71 +-
 .../hadoop/hbase/rest/TableScanResource.java       |   17 +-
 .../apache/hadoop/hbase/rest/VersionResource.java  |   15 +-
 .../apache/hadoop/hbase/rest/client/Client.java    |  342 ++-
 .../apache/hadoop/hbase/rest/client/Cluster.java   |   21 +-
 .../apache/hadoop/hbase/rest/client/Response.java  |   24 +-
 .../hadoop/hbase/rest/filter/AuthFilter.java       |   29 +-
 .../hbase/rest/filter/GZIPRequestStream.java       |    3 -
 .../hbase/rest/filter/GZIPRequestWrapper.java      |    4 -
 .../hbase/rest/filter/GZIPResponseStream.java      |    3 -
 .../hbase/rest/filter/GZIPResponseWrapper.java     |   12 +-
 .../hadoop/hbase/rest/filter/GzipFilter.java       |   24 +-
 .../rest/filter/RestCsrfPreventionFilter.java      |  139 +-
 .../apache/hadoop/hbase/rest/model/CellModel.java  |   77 +-
 .../hadoop/hbase/rest/model/CellSetModel.java      |   18 +-
 .../hadoop/hbase/rest/model/ColumnSchemaModel.java |   48 +-
 .../hbase/rest/model/NamespacesInstanceModel.java  |   51 +-
 .../hadoop/hbase/rest/model/NamespacesModel.java   |   23 +-
 .../apache/hadoop/hbase/rest/model/RowModel.java   |   56 +-
 .../hadoop/hbase/rest/model/ScannerModel.java      |  430 +--
 .../rest/model/StorageClusterStatusModel.java      |  110 +-
 .../rest/model/StorageClusterVersionModel.java     |   18 +-
 .../hadoop/hbase/rest/model/TableInfoModel.java    |   37 +-
 .../hadoop/hbase/rest/model/TableListModel.java    |   25 +-
 .../apache/hadoop/hbase/rest/model/TableModel.java |   21 +-
 .../hadoop/hbase/rest/model/TableRegionModel.java  |   55 +-
 .../hadoop/hbase/rest/model/TableSchemaModel.java  |   54 +-
 .../hadoop/hbase/rest/model/VersionModel.java      |   39 +-
 .../hbase/rest/provider/JAXBContextResolver.java   |   31 +-
 .../consumer/ProtobufMessageBodyConsumer.java      |   28 +-
 .../producer/PlainTextMessageBodyProducer.java     |   24 +-
 .../producer/ProtobufMessageBodyProducer.java      |   25 +-
 .../org/apache/hadoop/hbase/rest/DummyFilter.java  |   10 +-
 .../hadoop/hbase/rest/HBaseRESTTestingUtility.java |    7 +-
 .../hadoop/hbase/rest/PerformanceEvaluation.java   |  330 ++-
 .../apache/hadoop/hbase/rest/RowResourceBase.java  |  284 +-
 .../apache/hadoop/hbase/rest/TestDeleteRow.java    |   10 +-
 .../hadoop/hbase/rest/TestGZIPResponseWrapper.java |    6 +-
 .../hadoop/hbase/rest/TestGetAndPutResource.java   |  191 +-
 .../apache/hadoop/hbase/rest/TestGzipFilter.java   |   13 +-
 .../hadoop/hbase/rest/TestMultiRowResource.java    |   15 +-
 .../hbase/rest/TestNamespacesInstanceResource.java |   71 +-
 .../hadoop/hbase/rest/TestNamespacesResource.java  |    9 +-
 .../hadoop/hbase/rest/TestRESTServerSSL.java       |   15 +-
 .../hadoop/hbase/rest/TestResourceFilter.java      |   12 +-
 .../hadoop/hbase/rest/TestScannerResource.java     |   66 +-
 .../hadoop/hbase/rest/TestScannersWithFilters.java |  273 +-
 .../hadoop/hbase/rest/TestScannersWithLabels.java  |   25 +-
 .../hadoop/hbase/rest/TestSchemaResource.java      |   39 +-
 .../hadoop/hbase/rest/TestSecureRESTServer.java    |  121 +-
 .../hbase/rest/TestSecurityHeadersFilter.java      |   50 +-
 .../hadoop/hbase/rest/TestStatusResource.java      |   18 +-
 .../hadoop/hbase/rest/TestTableResource.java       |   43 +-
 .../apache/hadoop/hbase/rest/TestTableScan.java    |  154 +-
 .../hadoop/hbase/rest/TestVersionResource.java     |   46 +-
 .../hadoop/hbase/rest/client/RemoteAdmin.java      |  279 +-
 .../hadoop/hbase/rest/client/RemoteHTable.java     |  389 ++-
 .../hbase/rest/client/TestRemoteAdminRetries.java  |   10 +-
 .../hbase/rest/client/TestRemoteHTableRetries.java |   25 +-
 .../hadoop/hbase/rest/client/TestRemoteTable.java  |   53 +-
 .../hadoop/hbase/rest/client/TestXmlParsing.java   |   19 +-
 .../hadoop/hbase/rest/model/TestCellModel.java     |   15 +-
 .../hadoop/hbase/rest/model/TestCellSetModel.java  |   66 +-
 .../hbase/rest/model/TestColumnSchemaModel.java    |   21 +-
 .../hadoop/hbase/rest/model/TestModelBase.java     |   28 +-
 .../rest/model/TestNamespacesInstanceModel.java    |   39 +-
 .../hbase/rest/model/TestNamespacesModel.java      |   15 +-
 .../hadoop/hbase/rest/model/TestRowModel.java      |   14 +-
 .../hadoop/hbase/rest/model/TestScannerModel.java  |   27 +-
 .../rest/model/TestStorageClusterStatusModel.java  |  103 +-
 .../rest/model/TestStorageClusterVersionModel.java |   14 +-
 .../hbase/rest/model/TestTableInfoModel.java       |   32 +-
 .../hbase/rest/model/TestTableListModel.java       |   15 +-
 .../hbase/rest/model/TestTableRegionModel.java     |   35 +-
 .../hbase/rest/model/TestTableSchemaModel.java     |   40 +-
 .../hadoop/hbase/rest/model/TestVersionModel.java  |   32 +-
 hbase-rest/src/test/resources/mapred-site.xml      |    1 -
 hbase-rsgroup/pom.xml                              |   87 +-
 .../apache/hadoop/hbase/rsgroup/RSGroupAdmin.java  |   36 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminClient.java   |   94 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java |  187 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminServer.java   |  222 +-
 .../hbase/rsgroup/RSGroupBasedLoadBalancer.java    |  103 +-
 .../hadoop/hbase/rsgroup/RSGroupInfoManager.java   |   34 +-
 .../hbase/rsgroup/RSGroupInfoManagerImpl.java      |   88 +-
 .../hbase/rsgroup/RSGroupMajorCompactionTTL.java   |   29 +-
 .../hadoop/hbase/rsgroup/RSGroupProtobufUtil.java  |   58 +-
 .../apache/hadoop/hbase/rsgroup/RSGroupUtil.java   |    3 +-
 .../hadoop/hbase/rsgroup/RSGroupableBalancer.java  |    7 +-
 .../balancer/RSGroupableBalancerTestBase.java      |  153 +-
 .../balancer/TestRSGroupBasedLoadBalancer.java     |   58 +-
 ...lancerWithStochasticLoadBalancerAsInternal.java |   22 +-
 .../procedure/TestSCPWithReplicasWithRSGroup.java  |    6 +-
 .../rsgroup/TestDetermineRSGroupInfoForTable.java  |   26 +-
 .../hadoop/hbase/rsgroup/TestEnableRSGroups.java   |   10 +-
 .../hadoop/hbase/rsgroup/TestRSGroupConfig.java    |    7 +-
 .../rsgroup/TestRSGroupMajorCompactionTTL.java     |   22 +-
 .../hbase/rsgroup/TestRSGroupMappingScript.java    |   30 +-
 .../hadoop/hbase/rsgroup/TestRSGroupUtil.java      |   19 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java   |   48 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java   |   76 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsBalance.java  |    9 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsBase.java     |  120 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsBasics.java   |   13 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsFallback.java |   19 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsKillRS.java   |   51 +-
 .../hbase/rsgroup/TestRSGroupsOfflineMode.java     |   27 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsWithACL.java  |  111 +-
 .../rsgroup/TestTableDescriptorWithRSGroup.java    |   35 +-
 .../rsgroup/TestUpdateRSGroupConfiguration.java    |   23 +-
 .../hbase/rsgroup/VerifyingRSGroupAdminClient.java |   35 +-
 hbase-server/pom.xml                               |  486 ++--
 .../hadoop/hbase/CoordinatedStateManager.java      |   15 +-
 .../apache/hadoop/hbase/DaemonThreadFactory.java   |    2 +-
 .../hadoop/hbase/HDFSBlocksDistribution.java       |   58 +-
 .../org/apache/hadoop/hbase/HealthCheckChore.java  |   11 +-
 .../org/apache/hadoop/hbase/HealthChecker.java     |   49 +-
 .../java/org/apache/hadoop/hbase/HealthReport.java |   10 +-
 .../java/org/apache/hadoop/hbase/JMXListener.java  |   60 +-
 .../org/apache/hadoop/hbase/LocalHBaseCluster.java |  240 +-
 .../hadoop/hbase/MetaRegionLocationCache.java      |   34 +-
 .../apache/hadoop/hbase/RegionStateListener.java   |   15 +-
 .../main/java/org/apache/hadoop/hbase/Server.java  |   20 +-
 .../org/apache/hadoop/hbase/SplitLogCounters.java  |   30 +-
 .../java/org/apache/hadoop/hbase/SplitLogTask.java |   34 +-
 .../hbase/SslRMIClientSocketFactorySecure.java     |   28 +-
 .../hbase/SslRMIServerSocketFactorySecure.java     |   30 +-
 .../org/apache/hadoop/hbase/TableDescriptors.java  |   11 +-
 .../apache/hadoop/hbase/YouAreDeadException.java   |    4 +-
 .../apache/hadoop/hbase/ZKNamespaceManager.java    |   52 +-
 .../java/org/apache/hadoop/hbase/ZNodeClearer.java |   69 +-
 .../hbase/backup/FailedArchiveException.java       |   11 +-
 .../apache/hadoop/hbase/backup/HFileArchiver.java  |  272 +-
 .../hbase/backup/example/HFileArchiveManager.java  |   17 +-
 .../backup/example/HFileArchiveTableMonitor.java   |    8 +-
 .../example/LongTermArchivingHFileCleaner.java     |   15 +-
 .../backup/example/TableHFileArchiveTracker.java   |   20 +-
 .../hbase/backup/example/ZKTableArchiveClient.java |   26 +-
 .../hbase/client/ClientSideRegionScanner.java      |   16 +-
 .../hadoop/hbase/client/RegionServerRegistry.java  |    2 +-
 .../hadoop/hbase/client/ServerConnectionUtils.java |   49 +-
 .../hadoop/hbase/client/TableSnapshotScanner.java  |   68 +-
 .../hadoop/hbase/client/VersionInfoUtil.java       |   42 +-
 .../client/coprocessor/RowProcessorClient.java     |   21 +-
 .../hadoop/hbase/client/locking/EntityLock.java    |  100 +-
 .../hbase/client/locking/LockServiceClient.java    |   51 +-
 .../apache/hadoop/hbase/codec/MessageCodec.java    |   32 +-
 .../hadoop/hbase/constraint/BaseConstraint.java    |    8 +-
 .../apache/hadoop/hbase/constraint/Constraint.java |   60 +-
 .../hbase/constraint/ConstraintException.java      |   19 +-
 .../hbase/constraint/ConstraintProcessor.java      |   18 +-
 .../hadoop/hbase/constraint/Constraints.java       |  382 +--
 .../coordination/SplitLogManagerCoordination.java  |   16 +-
 .../coordination/SplitLogWorkerCoordination.java   |   63 +-
 .../ZKSplitLogManagerCoordination.java             |  104 +-
 .../coordination/ZkCoordinatedStateManager.java    |    9 +-
 .../coordination/ZkSplitLogWorkerCoordination.java |   98 +-
 .../hadoop/hbase/coprocessor/BaseEnvironment.java  |   25 +-
 .../coprocessor/BaseRowProcessorEndpoint.java      |   67 +-
 .../hadoop/hbase/coprocessor/BulkLoadObserver.java |   73 +-
 .../hadoop/hbase/coprocessor/CoprocessorHost.java  |  278 +-
 .../hbase/coprocessor/CoprocessorService.java      |    9 +-
 .../CoprocessorServiceBackwardCompatiblity.java    |   26 +-
 .../hadoop/hbase/coprocessor/CoreCoprocessor.java  |   16 +-
 .../hadoop/hbase/coprocessor/EndpointObserver.java |   83 +-
 .../hbase/coprocessor/HasMasterServices.java       |    6 +-
 .../hbase/coprocessor/HasRegionServerServices.java |    6 +-
 .../hbase/coprocessor/MasterCoprocessor.java       |   14 +-
 .../coprocessor/MasterCoprocessorEnvironment.java  |   66 +-
 .../hadoop/hbase/coprocessor/MasterObserver.java   | 1386 +++++-----
 .../hadoop/hbase/coprocessor/MetaTableMetrics.java |   37 +-
 .../hbase/coprocessor/MetricsCoprocessor.java      |   78 +-
 .../coprocessor/MultiRowMutationEndpoint.java      |   46 +-
 .../hadoop/hbase/coprocessor/ObserverContext.java  |   57 +-
 .../hbase/coprocessor/ObserverContextImpl.java     |    2 +-
 .../hbase/coprocessor/ReadOnlyConfiguration.java   |    8 +-
 .../hbase/coprocessor/RegionCoprocessor.java       |   14 +-
 .../coprocessor/RegionCoprocessorEnvironment.java  |   21 +-
 .../hadoop/hbase/coprocessor/RegionObserver.java   | 1153 ++++----
 .../hbase/coprocessor/RegionServerCoprocessor.java |   14 +-
 .../RegionServerCoprocessorEnvironment.java        |   65 +-
 .../hbase/coprocessor/RegionServerObserver.java    |   84 +-
 .../coprocessor/SingletonCoprocessorService.java   |    5 +-
 .../hadoop/hbase/coprocessor/WALCoprocessor.java   |   14 +-
 .../coprocessor/WALCoprocessorEnvironment.java     |   15 +-
 .../hadoop/hbase/coprocessor/WALObserver.java      |   92 +-
 .../hbase/errorhandling/ForeignException.java      |   68 +-
 .../errorhandling/ForeignExceptionDispatcher.java  |   31 +-
 .../errorhandling/ForeignExceptionListener.java    |    2 +-
 .../hbase/errorhandling/ForeignExceptionSnare.java |   36 +-
 .../hbase/errorhandling/TimeoutException.java      |   14 +-
 .../errorhandling/TimeoutExceptionInjector.java    |   19 +-
 .../apache/hadoop/hbase/executor/EventHandler.java |   71 +-
 .../apache/hadoop/hbase/executor/EventType.java    |  129 +-
 .../hadoop/hbase/executor/ExecutorService.java     |  122 +-
 .../apache/hadoop/hbase/executor/ExecutorType.java |   46 +-
 .../hbase/favored/FavoredNodeAssignmentHelper.java |  226 +-
 .../hbase/favored/FavoredNodeLoadBalancer.java     |  167 +-
 .../hadoop/hbase/favored/FavoredNodesManager.java  |   74 +-
 .../hadoop/hbase/favored/FavoredNodesPlan.java     |   35 +-
 .../hadoop/hbase/favored/FavoredNodesPromoter.java |   13 +-
 .../hbase/favored/StartcodeAgnosticServerName.java |   24 +-
 .../apache/hadoop/hbase/filter/FilterWrapper.java  |   48 +-
 .../org/apache/hadoop/hbase/fs/HFileSystem.java    |  186 +-
 .../hadoop/hbase/io/FSDataInputStreamWrapper.java  |  101 +-
 .../java/org/apache/hadoop/hbase/io/FileLink.java  |  137 +-
 .../java/org/apache/hadoop/hbase/io/HFileLink.java |  296 +--
 .../hadoop/hbase/io/HalfStoreFileReader.java       |   67 +-
 .../java/org/apache/hadoop/hbase/io/MetricsIO.java |    5 +-
 .../hadoop/hbase/io/MetricsIOWrapperImpl.java      |    3 +-
 .../java/org/apache/hadoop/hbase/io/Reference.java |  113 +-
 .../java/org/apache/hadoop/hbase/io/WALLink.java   |   28 +-
 .../apache/hadoop/hbase/io/WritableWithSize.java   |    9 +-
 .../apache/hadoop/hbase/io/hfile/AgeSnapshot.java  |    9 +-
 .../apache/hadoop/hbase/io/hfile/BlockCache.java   |   36 +-
 .../hadoop/hbase/io/hfile/BlockCacheFactory.java   |   67 +-
 .../hadoop/hbase/io/hfile/BlockCacheKey.java       |   18 +-
 .../hadoop/hbase/io/hfile/BlockCacheUtil.java      |  102 +-
 .../hadoop/hbase/io/hfile/BlockCachesIterator.java |    9 +-
 .../hadoop/hbase/io/hfile/BlockWithScanInfo.java   |    8 +-
 .../apache/hadoop/hbase/io/hfile/CacheConfig.java  |  141 +-
 .../apache/hadoop/hbase/io/hfile/CacheStats.java   |   55 +-
 .../apache/hadoop/hbase/io/hfile/Cacheable.java    |   24 +-
 .../hbase/io/hfile/CacheableDeserializer.java      |    8 +-
 .../io/hfile/CacheableDeserializerIdManager.java   |   56 +-
 .../apache/hadoop/hbase/io/hfile/CachedBlock.java  |    7 +-
 .../apache/hadoop/hbase/io/hfile/ChecksumUtil.java |  100 +-
 .../hadoop/hbase/io/hfile/CombinedBlockCache.java  |  119 +-
 .../hadoop/hbase/io/hfile/CompoundBloomFilter.java |   50 +-
 .../hbase/io/hfile/CompoundBloomFilterBase.java    |   15 +-
 .../hbase/io/hfile/CompoundBloomFilterWriter.java  |   97 +-
 .../hbase/io/hfile/CorruptHFileException.java      |    4 +-
 .../hbase/io/hfile/ExclusiveMemHFileBlock.java     |   10 +-
 .../hbase/io/hfile/FirstLevelBlockCache.java       |    4 +-
 .../hadoop/hbase/io/hfile/FixedFileTrailer.java    |  189 +-
 .../org/apache/hadoop/hbase/io/hfile/HFile.java    |  339 ++-
 .../apache/hadoop/hbase/io/hfile/HFileBlock.java   |  928 +++----
 .../hadoop/hbase/io/hfile/HFileBlockBuilder.java   |   10 +-
 .../hadoop/hbase/io/hfile/HFileBlockIndex.java     |  797 +++---
 .../hbase/io/hfile/HFileDataBlockEncoder.java      |   81 +-
 .../hbase/io/hfile/HFileDataBlockEncoderImpl.java  |   45 +-
 .../apache/hadoop/hbase/io/hfile/HFileInfo.java    |  121 +-
 .../hadoop/hbase/io/hfile/HFilePreadReader.java    |   11 +-
 .../hadoop/hbase/io/hfile/HFilePrettyPrinter.java  |  194 +-
 .../hadoop/hbase/io/hfile/HFileReaderImpl.java     |  447 ++--
 .../apache/hadoop/hbase/io/hfile/HFileScanner.java |  119 +-
 .../hadoop/hbase/io/hfile/HFileStreamReader.java   |    8 +-
 .../apache/hadoop/hbase/io/hfile/HFileUtil.java    |   15 +-
 .../hadoop/hbase/io/hfile/HFileWriterImpl.java     |  239 +-
 .../io/hfile/InclusiveCombinedBlockCache.java      |   37 +-
 .../hbase/io/hfile/IndexOnlyLruBlockCache.java     |    8 +-
 .../hadoop/hbase/io/hfile/InlineBlockWriter.java   |   36 +-
 .../hbase/io/hfile/InvalidHFileException.java      |    3 +-
 .../hbase/io/hfile/LruAdaptiveBlockCache.java      |  457 ++--
 .../hadoop/hbase/io/hfile/LruBlockCache.java       |  347 ++-
 .../hadoop/hbase/io/hfile/LruCachedBlock.java      |   37 +-
 .../hadoop/hbase/io/hfile/LruCachedBlockQueue.java |   45 +-
 .../hbase/io/hfile/NoOpDataBlockEncoder.java       |   51 +-
 .../hadoop/hbase/io/hfile/PrefetchExecutor.java    |   46 +-
 .../hadoop/hbase/io/hfile/ReaderContext.java       |    6 +-
 .../hbase/io/hfile/ReaderContextBuilder.java       |   15 +-
 .../hadoop/hbase/io/hfile/ResizableBlockCache.java |    3 +-
 .../hadoop/hbase/io/hfile/SharedMemHFileBlock.java |   10 +-
 .../hadoop/hbase/io/hfile/TinyLfuBlockCache.java   |  134 +-
 .../hbase/io/hfile/bucket/BucketAllocator.java     |  137 +-
 .../io/hfile/bucket/BucketAllocatorException.java  |   28 +-
 .../hadoop/hbase/io/hfile/bucket/BucketCache.java  |  384 ++-
 .../hbase/io/hfile/bucket/BucketCacheStats.java    |   37 +-
 .../hadoop/hbase/io/hfile/bucket/BucketEntry.java  |   14 +-
 .../hbase/io/hfile/bucket/BucketProtoUtils.java    |   64 +-
 .../hbase/io/hfile/bucket/ByteBufferIOEngine.java  |   47 +-
 .../hbase/io/hfile/bucket/CacheFullException.java  |   31 +-
 .../hbase/io/hfile/bucket/CachedEntryQueue.java    |   65 +-
 .../hfile/bucket/ExclusiveMemoryMmapIOEngine.java  |   26 +-
 .../hadoop/hbase/io/hfile/bucket/FileIOEngine.java |   87 +-
 .../hbase/io/hfile/bucket/FileMmapIOEngine.java    |   17 +-
 .../hadoop/hbase/io/hfile/bucket/IOEngine.java     |   45 +-
 .../hbase/io/hfile/bucket/PersistentIOEngine.java  |   20 +-
 .../io/hfile/bucket/SharedMemoryMmapIOEngine.java  |    3 +-
 .../hadoop/hbase/io/util/MemorySizeUtil.java       |  108 +-
 .../hbase/ipc/AdaptiveLifoCoDelCallQueue.java      |  134 +-
 .../hadoop/hbase/ipc/BalancedQueueRpcExecutor.java |   10 +-
 .../org/apache/hadoop/hbase/ipc/BufferChain.java   |   21 +-
 .../org/apache/hadoop/hbase/ipc/CallQueueInfo.java |    9 +-
 .../org/apache/hadoop/hbase/ipc/CallRunner.java    |   36 +-
 .../hbase/ipc/EmptyServiceNameException.java       |    5 +-
 .../ipc/FastPathBalancedQueueRpcExecutor.java      |   30 +-
 .../hbase/ipc/FastPathRWQueueRpcExecutor.java      |   23 +-
 .../hadoop/hbase/ipc/FastPathRpcHandler.java       |    7 +-
 .../apache/hadoop/hbase/ipc/FifoRpcScheduler.java  |   14 +-
 .../hadoop/hbase/ipc/HBaseRPCErrorHandler.java     |    6 +-
 .../hadoop/hbase/ipc/MasterFifoRpcScheduler.java   |    7 +-
 .../hadoop/hbase/ipc/MetaRWQueueRpcExecutor.java   |    9 +-
 .../hadoop/hbase/ipc/MetricsHBaseServer.java       |   33 +-
 .../hbase/ipc/MetricsHBaseServerWrapperImpl.java   |    4 +-
 .../hadoop/hbase/ipc/NettyRpcFrameDecoder.java     |   34 +-
 .../apache/hadoop/hbase/ipc/NettyRpcServer.java    |   61 +-
 .../hbase/ipc/NettyRpcServerPreambleHandler.java   |    9 +-
 .../hbase/ipc/NettyRpcServerRequestDecoder.java    |   12 +-
 .../hbase/ipc/NettyRpcServerResponseEncoder.java   |    8 +-
 .../apache/hadoop/hbase/ipc/NettyServerCall.java   |   13 +-
 .../hadoop/hbase/ipc/NettyServerRpcConnection.java |   21 +-
 .../hadoop/hbase/ipc/PluggableBlockingQueue.java   |   26 +-
 .../hbase/ipc/PluggableRpcQueueNotFound.java       |    6 +-
 .../apache/hadoop/hbase/ipc/PriorityFunction.java  |   27 +-
 .../org/apache/hadoop/hbase/ipc/QosPriority.java   |    2 +-
 .../org/apache/hadoop/hbase/ipc/QueueBalancer.java |    3 +-
 .../apache/hadoop/hbase/ipc/RPCTInfoGetter.java    |   14 +-
 .../hadoop/hbase/ipc/RWQueueRpcExecutor.java       |   57 +-
 .../hadoop/hbase/ipc/RandomQueueBalancer.java      |    7 +-
 .../java/org/apache/hadoop/hbase/ipc/RpcCall.java  |   33 +-
 .../apache/hadoop/hbase/ipc/RpcCallContext.java    |   40 +-
 .../org/apache/hadoop/hbase/ipc/RpcCallback.java   |    4 +-
 .../org/apache/hadoop/hbase/ipc/RpcExecutor.java   |  120 +-
 .../org/apache/hadoop/hbase/ipc/RpcHandler.java    |   15 +-
 .../org/apache/hadoop/hbase/ipc/RpcResponse.java   |    2 +-
 .../org/apache/hadoop/hbase/ipc/RpcScheduler.java  |   22 +-
 .../hadoop/hbase/ipc/RpcSchedulerContext.java      |    5 +-
 .../org/apache/hadoop/hbase/ipc/RpcServer.java     |  255 +-
 .../apache/hadoop/hbase/ipc/RpcServerFactory.java  |   29 +-
 .../hadoop/hbase/ipc/RpcServerInterface.java       |   28 +-
 .../org/apache/hadoop/hbase/ipc/ServerCall.java    |  100 +-
 .../hadoop/hbase/ipc/ServerRpcConnection.java      |  216 +-
 .../hadoop/hbase/ipc/SimpleRpcScheduler.java       |  117 +-
 .../apache/hadoop/hbase/ipc/SimpleRpcServer.java   |  210 +-
 .../hadoop/hbase/ipc/SimpleRpcServerResponder.java |   26 +-
 .../apache/hadoop/hbase/ipc/SimpleServerCall.java  |   16 +-
 .../hbase/ipc/SimpleServerRpcConnection.java       |   36 +-
 .../hadoop/hbase/ipc/UnknownServiceException.java  |    2 +-
 .../hbase/mapreduce/LoadIncrementalHFiles.java     |    8 +-
 .../hadoop/hbase/master/ActiveMasterManager.java   |  125 +-
 .../hbase/master/AssignmentVerificationReport.java |  227 +-
 .../hadoop/hbase/master/CachedClusterId.java       |   24 +-
 .../apache/hadoop/hbase/master/ClusterSchema.java  |   45 +-
 .../hadoop/hbase/master/ClusterSchemaService.java  |    6 +-
 .../hbase/master/ClusterSchemaServiceImpl.java     |   31 +-
 .../hbase/master/ClusterStatusPublisher.java       |   74 +-
 .../org/apache/hadoop/hbase/master/DeadServer.java |   66 +-
 .../hadoop/hbase/master/DrainingServerTracker.java |   57 +-
 .../hbase/master/ExpiredMobFileCleanerChore.java   |   32 +-
 .../org/apache/hadoop/hbase/master/HMaster.java    | 1305 +++++----
 .../hadoop/hbase/master/HMasterCommandLine.java    |   83 +-
 .../org/apache/hadoop/hbase/master/HbckChore.java  |  101 +-
 .../apache/hadoop/hbase/master/LoadBalancer.java   |   64 +-
 .../MasterAnnotationReadingPriorityFunction.java   |   29 +-
 .../hadoop/hbase/master/MasterCoprocessorHost.java |  384 ++-
 .../hadoop/hbase/master/MasterFileSystem.java      |  123 +-
 .../hbase/master/MasterInitializationMonitor.java  |    6 +-
 .../hbase/master/MasterMobCompactionThread.java    |   42 +-
 .../hbase/master/MasterRegionServerList.java       |    2 +-
 .../hadoop/hbase/master/MasterRpcServices.java     | 1027 ++++----
 .../apache/hadoop/hbase/master/MasterServices.java |  250 +-
 .../hadoop/hbase/master/MasterWalManager.java      |   73 +-
 .../hbase/master/MetricsAssignmentManager.java     |   21 +-
 .../apache/hadoop/hbase/master/MetricsMaster.java  |   42 +-
 .../hbase/master/MetricsMasterFileSystem.java      |    3 +-
 .../hbase/master/MetricsMasterWrapperImpl.java     |   35 +-
 .../hadoop/hbase/master/MetricsSnapshot.java       |    3 +-
 .../hbase/master/MirroringTableStateManager.java   |    3 +-
 .../hadoop/hbase/master/MobCompactionChore.java    |   23 +-
 .../hbase/master/NoSuchProcedureException.java     |    2 +-
 .../apache/hadoop/hbase/master/RackManager.java    |   20 +-
 .../hbase/master/RegionPlacementMaintainer.java    |  408 ++-
 .../org/apache/hadoop/hbase/master/RegionPlan.java |   34 +-
 .../hadoop/hbase/master/RegionServerList.java      |    2 +-
 .../hadoop/hbase/master/RegionServerTracker.java   |   34 +-
 .../hadoop/hbase/master/RegionsRecoveryChore.java  |   44 +-
 .../hbase/master/RegionsRecoveryConfigManager.java |   15 +-
 .../apache/hadoop/hbase/master/ServerListener.java |   16 +-
 .../apache/hadoop/hbase/master/ServerManager.java  |  363 ++-
 .../master/SnapshotOfRegionAssignmentFromMeta.java |   23 +-
 .../hadoop/hbase/master/SnapshotSentinel.java      |   12 +-
 .../hadoop/hbase/master/SplitLogManager.java       |  166 +-
 .../hadoop/hbase/master/SplitOrMergeTracker.java   |   29 +-
 .../hadoop/hbase/master/SplitWALManager.java       |   58 +-
 .../hadoop/hbase/master/TableNamespaceManager.java |  108 +-
 .../hadoop/hbase/master/TableStateManager.java     |   28 +-
 .../apache/hadoop/hbase/master/WorkerAssigner.java |   16 +-
 .../hbase/master/assignment/AssignProcedure.java   |   18 +-
 .../hbase/master/assignment/AssignmentManager.java |  606 +++--
 .../master/assignment/AssignmentManagerUtil.java   |   77 +-
 .../master/assignment/CloseRegionProcedure.java    |   14 +-
 .../assignment/GCMergedRegionsProcedure.java       |   75 +-
 .../GCMultipleMergedRegionsProcedure.java          |   73 +-
 .../hbase/master/assignment/GCRegionProcedure.java |   24 +-
 .../assignment/MergeTableRegionsProcedure.java     |  193 +-
 .../master/assignment/MoveRegionProcedure.java     |   20 +-
 .../master/assignment/OpenRegionProcedure.java     |   25 +-
 .../assignment/RegionRemoteProcedureBase.java      |   33 +-
 .../hbase/master/assignment/RegionStateNode.java   |   10 +-
 .../hbase/master/assignment/RegionStateStore.java  |   56 +-
 .../hbase/master/assignment/RegionStates.java      |  121 +-
 .../assignment/RegionTransitionProcedure.java      |   25 +-
 .../hbase/master/assignment/ServerState.java       |   13 +-
 .../hbase/master/assignment/ServerStateNode.java   |    8 +-
 .../assignment/SplitTableRegionProcedure.java      |  215 +-
 .../assignment/TransitRegionStateProcedure.java    |   65 +-
 .../hbase/master/assignment/UnassignProcedure.java |   17 +-
 .../hbase/master/balancer/AssignRegionAction.java  |    2 +-
 .../hbase/master/balancer/BalanceAction.java       |    7 +-
 .../hbase/master/balancer/BalancerChore.java       |   10 +-
 .../master/balancer/BalancerClusterState.java      |   75 +-
 .../hbase/master/balancer/BalancerRegionLoad.java  |    7 +-
 .../hbase/master/balancer/BaseLoadBalancer.java    |  142 +-
 .../hbase/master/balancer/CandidateGenerator.java  |   30 +-
 .../hbase/master/balancer/ClusterLoadState.java    |    2 +-
 .../hbase/master/balancer/ClusterStatusChore.java  |   12 +-
 .../balancer/CostFromRegionLoadFunction.java       |    2 +-
 .../hadoop/hbase/master/balancer/CostFunction.java |   10 +-
 .../hbase/master/balancer/DoubleArrayCost.java     |   14 +-
 .../master/balancer/FavoredStochasticBalancer.java |  156 +-
 .../HeterogeneousRegionCountCostFunction.java      |   58 +-
 .../hbase/master/balancer/LoadBalancerFactory.java |    9 +-
 .../master/balancer/LoadCandidateGenerator.java    |   19 +-
 .../balancer/LocalityBasedCandidateGenerator.java  |   21 +-
 .../master/balancer/MaintenanceLoadBalancer.java   |    4 +-
 .../master/balancer/MemStoreSizeCostFunction.java  |    2 +-
 .../hbase/master/balancer/MetricsBalancer.java     |    7 +-
 .../master/balancer/MetricsStochasticBalancer.java |   11 +-
 .../hbase/master/balancer/MoveRegionAction.java    |    3 +-
 .../PrimaryRegionCountSkewCostFunction.java        |    2 +-
 .../master/balancer/RackLocalityCostFunction.java  |    2 +-
 .../master/balancer/RandomCandidateGenerator.java  |    2 +-
 .../master/balancer/ReadRequestCostFunction.java   |    2 +-
 .../master/balancer/RegionInfoComparator.java      |   11 +-
 .../master/balancer/RegionLocationFinder.java      |   87 +-
 .../balancer/RegionReplicaCandidateGenerator.java  |   20 +-
 .../RegionReplicaGroupingCostFunction.java         |   10 +-
 .../balancer/RegionReplicaHostCostFunction.java    |    3 +-
 .../hbase/master/balancer/ServerAndLoad.java       |    5 +-
 .../balancer/ServerLocalityCostFunction.java       |    2 +-
 .../hbase/master/balancer/SimpleLoadBalancer.java  |  261 +-
 .../master/balancer/StochasticLoadBalancer.java    |  291 +-
 .../master/balancer/StoreFileCostFunction.java     |    2 +-
 .../hbase/master/balancer/SwapRegionsAction.java   |    2 +-
 .../master/balancer/TableSkewCostFunction.java     |    1 +
 .../master/balancer/WriteRequestCostFunction.java  |    2 +-
 .../master/cleaner/BaseFileCleanerDelegate.java    |    8 +-
 .../master/cleaner/BaseHFileCleanerDelegate.java   |   11 +-
 .../master/cleaner/BaseLogCleanerDelegate.java     |   24 +-
 .../master/cleaner/BaseTimeToLiveFileCleaner.java  |    4 +-
 .../hadoop/hbase/master/cleaner/CleanerChore.java  |   70 +-
 .../hadoop/hbase/master/cleaner/DirScanPool.java   |    2 +-
 .../hbase/master/cleaner/FileCleanerDelegate.java  |   13 +-
 .../hadoop/hbase/master/cleaner/HFileCleaner.java  |   98 +-
 .../hbase/master/cleaner/HFileLinkCleaner.java     |   30 +-
 .../hadoop/hbase/master/cleaner/LogCleaner.java    |   41 +-
 .../master/cleaner/ReplicationBarrierCleaner.java  |   17 +-
 .../hbase/master/cleaner/SnapshotCleanerChore.java |   35 +-
 .../master/cleaner/TimeToLiveHFileCleaner.java     |    6 +-
 .../hbase/master/cleaner/TimeToLiveLogCleaner.java |    2 +-
 .../TimeToLiveMasterLocalStoreHFileCleaner.java    |    2 +-
 .../TimeToLiveMasterLocalStoreWALCleaner.java      |    2 +-
 .../cleaner/TimeToLiveProcedureWALCleaner.java     |    2 +-
 .../hbase/master/http/MasterDumpServlet.java       |   13 +-
 .../hbase/master/http/MasterRedirectServlet.java   |   25 +-
 .../hbase/master/http/MasterStatusServlet.java     |   36 +-
 .../hadoop/hbase/master/http/MetaBrowser.java      |   85 +-
 .../hbase/master/http/RegionReplicaInfo.java       |   47 +-
 .../hadoop/hbase/master/http/RegionVisualizer.java |   60 +-
 .../master/http/api_v1/ResourceConfigFactory.java  |   28 +-
 .../cluster_metrics/model/ClusterMetrics.java      |   15 +-
 .../resource/ClusterMetricsResource.java           |   18 +-
 .../hadoop/hbase/master/http/gson/GsonFactory.java |   10 +-
 .../master/http/gson/GsonSerializationFeature.java |    9 +-
 .../master/http/gson/SizeAsBytesSerializer.java    |    1 +
 .../hbase/master/http/jersey/MasterFeature.java    |    9 +-
 .../hbase/master/janitor/CatalogJanitor.java       |   46 +-
 .../hadoop/hbase/master/janitor/MetaFixer.java     |  132 +-
 .../apache/hadoop/hbase/master/janitor/Report.java |    6 +-
 .../hbase/master/janitor/ReportMakingVisitor.java  |    6 +-
 .../hadoop/hbase/master/locking/LockManager.java   |  107 +-
 .../hadoop/hbase/master/locking/LockProcedure.java |   76 +-
 .../hbase/master/migrate/RollingUpgradeChore.java  |   19 +-
 .../master/normalizer/MergeNormalizationPlan.java  |   21 +-
 .../hbase/master/normalizer/NormalizationPlan.java |    6 +-
 .../master/normalizer/NormalizationTarget.java     |   18 +-
 .../hbase/master/normalizer/RegionNormalizer.java  |   19 +-
 .../master/normalizer/RegionNormalizerFactory.java |    6 +-
 .../master/normalizer/RegionNormalizerManager.java |   24 +-
 .../normalizer/RegionNormalizerWorkQueue.java      |   42 +-
 .../master/normalizer/RegionNormalizerWorker.java  |   44 +-
 .../master/normalizer/SimpleRegionNormalizer.java  |  198 +-
 .../master/normalizer/SplitNormalizationPlan.java  |   15 +-
 .../AbstractStateMachineNamespaceProcedure.java    |   12 +-
 .../AbstractStateMachineRegionProcedure.java       |   18 +-
 .../AbstractStateMachineTableProcedure.java        |   31 +-
 .../master/procedure/CloneSnapshotProcedure.java   |  189 +-
 .../master/procedure/CreateNamespaceProcedure.java |  135 +-
 .../master/procedure/CreateTableProcedure.java     |  116 +-
 .../master/procedure/DeleteNamespaceProcedure.java |  152 +-
 .../master/procedure/DeleteTableProcedure.java     |   54 +-
 .../master/procedure/DisableTableProcedure.java    |   65 +-
 .../master/procedure/EnableTableProcedure.java     |   95 +-
 .../hadoop/hbase/master/procedure/FairQueue.java   |    2 +-
 .../master/procedure/HBCKServerCrashProcedure.java |   84 +-
 .../hbase/master/procedure/InitMetaProcedure.java  |    9 +-
 .../master/procedure/MasterDDLOperationHelper.java |   16 +-
 .../master/procedure/MasterProcedureConstants.java |   16 +-
 .../hbase/master/procedure/MasterProcedureEnv.java |    5 +-
 .../master/procedure/MasterProcedureScheduler.java |  201 +-
 .../master/procedure/MasterProcedureUtil.java      |   42 +-
 .../master/procedure/MetaProcedureInterface.java   |    2 +-
 .../hadoop/hbase/master/procedure/MetaQueue.java   |    2 +-
 .../master/procedure/ModifyNamespaceProcedure.java |   89 +-
 .../procedure/ModifyTableDescriptorProcedure.java  |    4 +-
 .../master/procedure/ModifyTableProcedure.java     |  139 +-
 .../master/procedure/PeerProcedureInterface.java   |    9 +-
 .../hadoop/hbase/master/procedure/PeerQueue.java   |    4 +-
 .../hbase/master/procedure/ProcedureDescriber.java |   28 +-
 .../master/procedure/ProcedurePrepareLatch.java    |   26 +-
 .../hbase/master/procedure/ProcedureSyncWait.java  |   61 +-
 .../hadoop/hbase/master/procedure/Queue.java       |    7 +-
 .../master/procedure/RSProcedureDispatcher.java    |   85 +-
 .../master/procedure/RecoverMetaProcedure.java     |   14 +-
 .../procedure/ReopenTableRegionsProcedure.java     |   28 +-
 .../master/procedure/RestoreSnapshotProcedure.java |  166 +-
 .../hbase/master/procedure/SchemaLocking.java      |   18 +-
 .../master/procedure/ServerCrashException.java     |    8 +-
 .../master/procedure/ServerCrashProcedure.java     |  107 +-
 .../master/procedure/ServerProcedureInterface.java |   14 +-
 .../hadoop/hbase/master/procedure/ServerQueue.java |    2 +-
 .../master/procedure/ServerRemoteProcedure.java    |   92 +-
 .../hbase/master/procedure/SnapshotProcedure.java  |   78 +-
 .../master/procedure/SnapshotRegionProcedure.java  |   24 +-
 .../master/procedure/SnapshotVerifyProcedure.java  |   25 +-
 .../hbase/master/procedure/SplitWALProcedure.java  |   42 +-
 .../master/procedure/SplitWALRemoteProcedure.java  |   33 +-
 .../procedure/SwitchRpcThrottleProcedure.java      |   20 +-
 .../SwitchRpcThrottleRemoteProcedure.java          |   19 +-
 .../master/procedure/TableProcedureInterface.java  |   30 +-
 .../hadoop/hbase/master/procedure/TableQueue.java  |    4 +-
 .../master/procedure/TruncateTableProcedure.java   |   53 +-
 .../hadoop/hbase/master/region/MasterRegion.java   |   27 +-
 .../hbase/master/region/MasterRegionFactory.java   |    9 +-
 .../region/MasterRegionFlusherAndCompactor.java    |    2 +-
 .../hbase/master/region/MasterRegionParams.java    |    2 +-
 .../hbase/master/region/MasterRegionUtils.java     |    2 +-
 .../hbase/master/region/MasterRegionWALRoller.java |    6 +-
 .../region/RegionScannerAsResultScanner.java       |    4 +-
 .../hbase/master/region/UpdateMasterRegion.java    |    4 +-
 .../master/replication/AbstractPeerProcedure.java  |    4 +-
 .../hbase/master/replication/AddPeerProcedure.java |   11 +-
 .../ClaimReplicationQueueRemoteProcedure.java      |    2 +-
 .../ClaimReplicationQueuesProcedure.java           |    2 +-
 .../master/replication/DisablePeerProcedure.java   |    2 +-
 .../master/replication/EnablePeerProcedure.java    |    2 +-
 .../master/replication/ModifyPeerProcedure.java    |   41 +-
 .../master/replication/RefreshPeerProcedure.java   |   11 +-
 .../master/replication/RemovePeerProcedure.java    |    4 +-
 .../master/replication/ReplicationPeerManager.java |   79 +-
 .../replication/UpdatePeerConfigProcedure.java     |    8 +-
 .../hbase/master/slowlog/SlowLogMasterService.java |   21 +-
 .../snapshot/DisabledTableSnapshotHandler.java     |   22 +-
 .../snapshot/EnabledTableSnapshotHandler.java      |   32 +-
 .../master/snapshot/MasterSnapshotVerifier.java    |   70 +-
 .../hbase/master/snapshot/SnapshotFileCache.java   |   59 +-
 .../master/snapshot/SnapshotHFileCleaner.java      |   22 +-
 .../hbase/master/snapshot/SnapshotManager.java     |  486 ++--
 .../hbase/master/snapshot/TakeSnapshotHandler.java |   88 +-
 .../hbase/master/zksyncer/ClientZKSyncer.java      |    5 +-
 .../hbase/master/zksyncer/MasterAddressSyncer.java |    3 +-
 .../hbase/master/zksyncer/MetaLocationSyncer.java  |    3 +-
 .../org/apache/hadoop/hbase/mob/CachedMobFile.java |   26 +-
 .../hadoop/hbase/mob/DefaultMobStoreCompactor.java |  113 +-
 .../hadoop/hbase/mob/DefaultMobStoreFlusher.java   |  103 +-
 .../hadoop/hbase/mob/ExpiredMobFileCleaner.java    |   39 +-
 .../hbase/mob/ManualMobMaintHFileCleaner.java      |   16 +-
 .../java/org/apache/hadoop/hbase/mob/MobCell.java  |    5 +-
 .../org/apache/hadoop/hbase/mob/MobConstants.java  |   41 +-
 .../java/org/apache/hadoop/hbase/mob/MobFile.java  |   42 +-
 .../org/apache/hadoop/hbase/mob/MobFileCache.java  |   47 +-
 .../org/apache/hadoop/hbase/mob/MobFileName.java   |   59 +-
 .../apache/hadoop/hbase/mob/MobStoreEngine.java    |    3 +-
 .../java/org/apache/hadoop/hbase/mob/MobUtils.java |  514 ++--
 .../mob/compactions/MobCompactionRequest.java      |    3 +-
 .../hadoop/hbase/mob/compactions/MobCompactor.java |   19 +-
 .../PartitionedMobCompactionRequest.java           |   48 +-
 .../mob/compactions/PartitionedMobCompactor.java   |  226 +-
 .../monitoring/MemoryBoundedLogMessageBuffer.java  |   49 +-
 .../hbase/monitoring/MonitoredRPCHandler.java      |   18 +-
 .../hbase/monitoring/MonitoredRPCHandlerImpl.java  |   90 +-
 .../hadoop/hbase/monitoring/MonitoredTask.java     |   26 +-
 .../hadoop/hbase/monitoring/MonitoredTaskImpl.java |   19 +-
 .../hadoop/hbase/monitoring/StateDumpServlet.java  |   16 +-
 .../hadoop/hbase/monitoring/TaskMonitor.java       |  130 +-
 .../hadoop/hbase/monitoring/ThreadMonitoring.java  |   31 +-
 .../hbase/namequeues/BalancerDecisionDetails.java  |    6 +-
 .../hbase/namequeues/BalancerRejectionDetails.java |    6 +-
 .../namequeues/DisruptorExceptionHandler.java      |    2 -
 .../hadoop/hbase/namequeues/LogEventHandler.java   |   35 +-
 .../hadoop/hbase/namequeues/LogHandlerUtils.java   |   17 +-
 .../hadoop/hbase/namequeues/NamedQueuePayload.java |    9 +-
 .../hbase/namequeues/NamedQueueRecorder.java       |   34 +-
 .../hadoop/hbase/namequeues/NamedQueueService.java |   19 +-
 .../hbase/namequeues/RingBufferEnvelope.java       |   16 +-
 .../hadoop/hbase/namequeues/RpcLogDetails.java     |   20 +-
 .../hbase/namequeues/SlowLogPersistentService.java |   18 +-
 .../hbase/namequeues/SlowLogTableOpsChore.java     |   12 +-
 .../impl/BalancerDecisionQueueService.java         |   28 +-
 .../impl/BalancerRejectionQueueService.java        |   43 +-
 .../hbase/namequeues/impl/SlowLogQueueService.java |   64 +-
 .../namequeues/request/NamedQueueGetRequest.java   |   31 +-
 .../namequeues/response/NamedQueueGetResponse.java |   13 +-
 .../hadoop/hbase/namespace/NamespaceAuditor.java   |   46 +-
 .../hbase/namespace/NamespaceStateManager.java     |   87 +-
 .../namespace/NamespaceTableAndRegionInfo.java     |   21 +-
 .../hbase/procedure/MasterProcedureManager.java    |   84 +-
 .../procedure/MasterProcedureManagerHost.java      |   13 +-
 .../apache/hadoop/hbase/procedure/Procedure.java   |  171 +-
 .../hbase/procedure/ProcedureCoordinator.java      |  124 +-
 .../hbase/procedure/ProcedureCoordinatorRpcs.java  |   38 +-
 .../hadoop/hbase/procedure/ProcedureManager.java   |   10 +-
 .../hbase/procedure/ProcedureManagerHost.java      |   33 +-
 .../hadoop/hbase/procedure/ProcedureMember.java    |   98 +-
 .../hbase/procedure/ProcedureMemberRpcs.java       |   24 +-
 .../procedure/RegionServerProcedureManager.java    |   16 +-
 .../RegionServerProcedureManagerHost.java          |   19 +-
 .../hadoop/hbase/procedure/Subprocedure.java       |  144 +-
 .../hbase/procedure/SubprocedureFactory.java       |    8 +-
 .../hbase/procedure/ZKProcedureCoordinator.java    |   62 +-
 .../hbase/procedure/ZKProcedureMemberRpcs.java     |  104 +-
 .../hadoop/hbase/procedure/ZKProcedureUtil.java    |   85 +-
 .../procedure/flush/FlushTableSubprocedure.java    |   31 +-
 .../flush/MasterFlushTableProcedureManager.java    |   30 +-
 .../RegionServerFlushTableProcedureManager.java    |  112 +-
 .../hbase/procedure2/BaseRSProcedureCallable.java  |    2 +-
 .../hbase/procedure2/RSProcedureCallable.java      |    5 +-
 .../store/region/HFileProcedurePrettyPrinter.java  |   10 +-
 .../store/region/RegionProcedureStore.java         |   30 +-
 .../store/region/WALProcedurePrettyPrinter.java    |   12 +-
 .../hbase/protobuf/ReplicationProtbufUtil.java     |   79 +-
 .../hbase/quotas/ActivePolicyEnforcement.java      |   67 +-
 .../hbase/quotas/AverageIntervalRateLimiter.java   |   35 +-
 .../hadoop/hbase/quotas/DefaultOperationQuota.java |   22 +-
 .../hadoop/hbase/quotas/ExceedOperationQuota.java  |    8 +-
 .../hadoop/hbase/quotas/FileArchiverNotifier.java  |   29 +-
 .../hbase/quotas/FileArchiverNotifierFactory.java  |   17 +-
 .../quotas/FileArchiverNotifierFactoryImpl.java    |   29 +-
 .../hbase/quotas/FileArchiverNotifierImpl.java     |  144 +-
 .../hbase/quotas/FileSystemUtilizationChore.java   |   51 +-
 .../hbase/quotas/FixedIntervalRateLimiter.java     |   27 +-
 .../hadoop/hbase/quotas/GlobalQuotaSettings.java   |   22 +-
 .../hbase/quotas/GlobalQuotaSettingsImpl.java      |   68 +-
 .../hadoop/hbase/quotas/MasterQuotaManager.java    |  181 +-
 .../hadoop/hbase/quotas/MasterQuotasObserver.java  |   30 +-
 .../hbase/quotas/NamespaceQuotaSnapshotStore.java  |   33 +-
 .../hadoop/hbase/quotas/NoOpRegionSizeStore.java   |   30 +-
 .../hadoop/hbase/quotas/NoopOperationQuota.java    |   11 +-
 .../hadoop/hbase/quotas/NoopQuotaLimiter.java      |    9 +-
 .../apache/hadoop/hbase/quotas/OperationQuota.java |   43 +-
 .../org/apache/hadoop/hbase/quotas/QuotaCache.java |   77 +-
 .../apache/hadoop/hbase/quotas/QuotaLimiter.java   |   52 +-
 .../hadoop/hbase/quotas/QuotaLimiterFactory.java   |    6 +-
 .../hadoop/hbase/quotas/QuotaObserverChore.java    |  261 +-
 .../hadoop/hbase/quotas/QuotaSnapshotStore.java    |   39 +-
 .../org/apache/hadoop/hbase/quotas/QuotaState.java |   21 +-
 .../org/apache/hadoop/hbase/quotas/QuotaUtil.java  |  163 +-
 .../apache/hadoop/hbase/quotas/RateLimiter.java    |   89 +-
 .../hbase/quotas/RegionServerRpcQuotaManager.java  |   88 +-
 .../quotas/RegionServerSpaceQuotaManager.java      |   97 +-
 .../org/apache/hadoop/hbase/quotas/RegionSize.java |   20 +-
 .../apache/hadoop/hbase/quotas/RegionSizeImpl.java |   26 +-
 .../hbase/quotas/RegionSizeReportingChore.java     |   52 +-
 .../hadoop/hbase/quotas/RegionSizeStore.java       |   30 +-
 .../hbase/quotas/RegionSizeStoreFactory.java       |   18 +-
 .../hadoop/hbase/quotas/RegionSizeStoreImpl.java   |   31 +-
 .../hadoop/hbase/quotas/RpcThrottleStorage.java    |    1 -
 .../hbase/quotas/SnapshotQuotaObserverChore.java   |  110 +-
 .../hbase/quotas/SpaceLimitingException.java       |   17 +-
 .../hbase/quotas/SpaceQuotaRefresherChore.java     |   80 +-
 .../hbase/quotas/SpaceQuotaSnapshotNotifier.java   |   26 +-
 .../quotas/SpaceQuotaSnapshotNotifierFactory.java  |   31 +-
 .../quotas/SpaceViolationPolicyEnforcement.java    |   32 +-
 .../SpaceViolationPolicyEnforcementFactory.java    |   43 +-
 .../hbase/quotas/TableQuotaSnapshotStore.java      |   34 +-
 .../quotas/TableSpaceQuotaSnapshotNotifier.java    |   18 +-
 .../hadoop/hbase/quotas/TimeBasedLimiter.java      |   29 +-
 .../apache/hadoop/hbase/quotas/UserQuotaState.java |   51 +-
 .../AbstractViolationPolicyEnforcement.java        |   29 +-
 .../DefaultViolationPolicyEnforcement.java         |   33 +-
 .../DisableTableViolationPolicyEnforcement.java    |   22 +-
 .../MissingSnapshotViolationPolicyEnforcement.java |   29 +-
 .../NoInsertsViolationPolicyEnforcement.java       |   27 +-
 ...ritesCompactionsViolationPolicyEnforcement.java |   26 +-
 .../NoWritesViolationPolicyEnforcement.java        |   29 +-
 .../hbase/regionserver/AbstractMemStore.java       |  116 +-
 .../regionserver/AbstractMultiFileWriter.java      |   14 +-
 .../AdaptiveMemStoreCompactionStrategy.java        |   53 +-
 .../AnnotationReadingPriorityFunction.java         |  120 +-
 .../hbase/regionserver/BaseRowProcessor.java       |   12 +-
 .../BasicMemStoreCompactionStrategy.java           |   10 +-
 .../hbase/regionserver/BootstrapNodeManager.java   |    8 +-
 .../hbase/regionserver/BrokenStoreFileCleaner.java |   67 +-
 .../hbase/regionserver/BusyRegionSplitPolicy.java  |   46 +-
 .../regionserver/ByteBufferChunkKeyValue.java      |    7 +-
 .../hbase/regionserver/CSLMImmutableSegment.java   |   18 +-
 .../regionserver/CellArrayImmutableSegment.java    |   73 +-
 .../hadoop/hbase/regionserver/CellArrayMap.java    |   26 +-
 .../regionserver/CellChunkImmutableSegment.java    |  117 +-
 .../hadoop/hbase/regionserver/CellChunkMap.java    |   90 +-
 .../hadoop/hbase/regionserver/CellFlatMap.java     |  104 +-
 .../apache/hadoop/hbase/regionserver/CellSet.java  |   26 +-
 .../apache/hadoop/hbase/regionserver/CellSink.java |   11 +-
 .../hbase/regionserver/ChangedReadersObserver.java |    9 +-
 .../apache/hadoop/hbase/regionserver/Chunk.java    |   23 +-
 .../hadoop/hbase/regionserver/ChunkCreator.java    |  146 +-
 .../hadoop/hbase/regionserver/CompactSplit.java    |  207 +-
 .../CompactedHFilesDischargeHandler.java           |    6 +-
 .../regionserver/CompactedHFilesDischarger.java    |   40 +-
 .../hbase/regionserver/CompactingMemStore.java     |  196 +-
 .../hbase/regionserver/CompactionPipeline.java     |  132 +-
 .../regionserver/CompositeImmutableSegment.java    |   32 +-
 .../ConstantSizeRegionSplitPolicy.java             |   30 +-
 .../regionserver/CreateStoreFileWriterParams.java  |    2 +-
 .../regionserver/CustomizedScanInfoBuilder.java    |    8 +-
 .../regionserver/DateTieredMultiFileWriter.java    |    9 +-
 .../hbase/regionserver/DateTieredStoreEngine.java  |   27 +-
 .../hbase/regionserver/DefaultHeapMemoryTuner.java |  266 +-
 .../hadoop/hbase/regionserver/DefaultMemStore.java |   92 +-
 .../hbase/regionserver/DefaultStoreEngine.java     |   69 +-
 .../regionserver/DefaultStoreFileManager.java      |   33 +-
 .../hbase/regionserver/DefaultStoreFlusher.java    |   11 +-
 .../DelimitedKeyPrefixRegionSplitPolicy.java       |   46 +-
 .../DelimitedKeyPrefixRegionSplitRestriction.java  |   19 +-
 .../regionserver/DisabledRegionSplitPolicy.java    |    5 +-
 .../regionserver/DumpRegionServerMetrics.java      |   21 +-
 .../EagerMemStoreCompactionStrategy.java           |    5 +-
 .../hbase/regionserver/FavoredNodesForRegion.java  |   20 +-
 .../regionserver/FifoRpcSchedulerFactory.java      |    6 +-
 .../regionserver/FlushAllLargeStoresPolicy.java    |    3 +-
 .../hbase/regionserver/FlushAllStoresPolicy.java   |    1 -
 .../hbase/regionserver/FlushLargeStoresPolicy.java |   62 +-
 .../hbase/regionserver/FlushLifeCycleTracker.java  |    2 +-
 .../FlushNonSloppyStoresFirstPolicy.java           |    8 +-
 .../hadoop/hbase/regionserver/FlushPolicy.java     |    3 +-
 .../hbase/regionserver/FlushPolicyFactory.java     |   18 +-
 .../hbase/regionserver/FlushRequestListener.java   |    7 +-
 .../hadoop/hbase/regionserver/FlushRequester.java  |   29 +-
 .../hadoop/hbase/regionserver/FlushType.java       |   19 +-
 .../hadoop/hbase/regionserver/HMobStore.java       |  208 +-
 .../apache/hadoop/hbase/regionserver/HRegion.java  | 2773 +++++++++-----------
 .../hbase/regionserver/HRegionFileSystem.java      |  398 ++-
 .../hadoop/hbase/regionserver/HRegionServer.java   | 1082 ++++----
 .../regionserver/HRegionServerCommandLine.java     |   19 +-
 .../hbase/regionserver/HRegionWALFileSystem.java   |    2 +-
 .../apache/hadoop/hbase/regionserver/HStore.java   |  706 +++--
 .../hadoop/hbase/regionserver/HStoreFile.java      |  132 +-
 .../hbase/regionserver/HeapMemoryManager.java      |  168 +-
 .../hadoop/hbase/regionserver/HeapMemoryTuner.java |   13 +-
 .../hbase/regionserver/ImmutableMemStoreLAB.java   |   36 +-
 .../hbase/regionserver/ImmutableSegment.java       |   35 +-
 .../IncreasingToUpperBoundRegionSplitPolicy.java   |   44 +-
 .../regionserver/InputStreamBlockDistribution.java |   47 +-
 .../hadoop/hbase/regionserver/InternalScan.java    |   32 +-
 .../hadoop/hbase/regionserver/InternalScanner.java |   33 +-
 .../regionserver/KeyPrefixRegionSplitPolicy.java   |   39 +-
 .../KeyPrefixRegionSplitRestriction.java           |   18 +-
 .../hadoop/hbase/regionserver/KeyValueHeap.java    |  156 +-
 .../hadoop/hbase/regionserver/KeyValueScanner.java |  105 +-
 .../hadoop/hbase/regionserver/LastSequenceId.java  |    4 +-
 .../hadoop/hbase/regionserver/LeaseListener.java   |   14 +-
 .../hadoop/hbase/regionserver/LeaseManager.java    |   78 +-
 .../hadoop/hbase/regionserver/LogRoller.java       |   12 +-
 .../MasterFifoRpcSchedulerFactory.java             |    4 +-
 .../apache/hadoop/hbase/regionserver/MemStore.java |   64 +-
 .../regionserver/MemStoreCompactionStrategy.java   |   54 +-
 .../hbase/regionserver/MemStoreCompactor.java      |  137 +-
 .../MemStoreCompactorSegmentsIterator.java         |   22 +-
 .../hadoop/hbase/regionserver/MemStoreFlusher.java |  300 +--
 .../hadoop/hbase/regionserver/MemStoreLAB.java     |   43 +-
 .../hadoop/hbase/regionserver/MemStoreLABImpl.java |   62 +-
 .../MemStoreMergerSegmentsIterator.java            |   23 +-
 .../regionserver/MemStoreSegmentsIterator.java     |   16 +-
 .../hadoop/hbase/regionserver/MemStoreSize.java    |   27 +-
 .../hadoop/hbase/regionserver/MemStoreSizing.java  |   44 +-
 .../hbase/regionserver/MemStoreSnapshot.java       |    3 +-
 .../regionserver/MetricsHeapMemoryManager.java     |   28 +-
 .../hadoop/hbase/regionserver/MetricsRegion.java   |   37 +-
 .../hbase/regionserver/MetricsRegionServer.java    |   53 +-
 .../MetricsRegionServerWrapperImpl.java            |   99 +-
 .../regionserver/MetricsRegionWrapperImpl.java     |   27 +-
 .../hadoop/hbase/regionserver/MetricsTable.java    |   46 +-
 .../MetricsTableWrapperAggregateImpl.java          |   39 +-
 .../hbase/regionserver/MetricsUserAggregate.java   |    3 +-
 .../regionserver/MetricsUserAggregateFactory.java  |   35 +-
 .../regionserver/MetricsUserAggregateImpl.java     |   17 +-
 .../regionserver/MiniBatchOperationInProgress.java |   48 +-
 .../hbase/regionserver/MobReferenceOnlyFilter.java |    5 +-
 .../hadoop/hbase/regionserver/MobStoreScanner.java |   12 +-
 .../MultiVersionConcurrencyControl.java            |   70 +-
 .../hbase/regionserver/MutableOnlineRegions.java   |   12 +-
 .../hadoop/hbase/regionserver/MutableSegment.java  |   27 +-
 .../hbase/regionserver/NoLimitScannerContext.java  |    2 +-
 .../regionserver/NoTagByteBufferChunkKeyValue.java |    6 +-
 .../hbase/regionserver/NonLazyKeyValueScanner.java |   19 +-
 .../NonReversedNonLazyKeyValueScanner.java         |   50 +-
 .../regionserver/NonThreadSafeMemStoreSizing.java  |   10 +-
 .../hadoop/hbase/regionserver/OffheapChunk.java    |    3 +-
 .../hadoop/hbase/regionserver/OnheapChunk.java     |    3 +-
 .../hadoop/hbase/regionserver/OnlineRegions.java   |   36 +-
 .../hadoop/hbase/regionserver/OperationStatus.java |   22 +-
 .../hadoop/hbase/regionserver/RSRpcServices.java   |  967 ++++---
 .../hbase/regionserver/RSSnapshotVerifier.java     |   60 +-
 .../apache/hadoop/hbase/regionserver/Region.java   |  376 ++-
 .../hbase/regionserver/RegionCoprocessorHost.java  |  838 +++---
 .../hadoop/hbase/regionserver/RegionScanner.java   |   29 +-
 .../hbase/regionserver/RegionScannerImpl.java      |   44 +-
 .../hbase/regionserver/RegionServerAccounting.java |   22 +-
 .../regionserver/RegionServerCoprocessorHost.java  |   97 +-
 .../hbase/regionserver/RegionServerServices.java   |   35 +-
 .../regionserver/RegionServerTableMetrics.java     |   19 +-
 .../regionserver/RegionServicesForStores.java      |   22 +-
 .../hbase/regionserver/RegionSplitPolicy.java      |   93 +-
 .../hbase/regionserver/RegionSplitRestriction.java |   21 +-
 .../RemoteProcedureResultReporter.java             |    8 +-
 .../hbase/regionserver/ReplicationSinkService.java |   26 +-
 .../regionserver/ReplicationSourceService.java     |    7 +-
 .../hbase/regionserver/ReversedKeyValueHeap.java   |   92 +-
 .../regionserver/ReversedMobStoreScanner.java      |   12 +-
 .../regionserver/ReversedRegionScannerImpl.java    |   37 +-
 .../hbase/regionserver/ReversedStoreScanner.java   |   70 +-
 .../hadoop/hbase/regionserver/RowProcessor.java    |   88 +-
 .../hbase/regionserver/RowTooBigException.java     |   13 +-
 .../hbase/regionserver/RpcSchedulerFactory.java    |    8 +-
 .../apache/hadoop/hbase/regionserver/ScanInfo.java |   90 +-
 .../hadoop/hbase/regionserver/ScanOptions.java     |   11 +-
 .../apache/hadoop/hbase/regionserver/ScanType.java |    2 +-
 .../hadoop/hbase/regionserver/ScannerContext.java  |   71 +-
 .../hbase/regionserver/ScannerIdGenerator.java     |   21 +-
 .../hbase/regionserver/SecureBulkLoadManager.java  |  145 +-
 .../apache/hadoop/hbase/regionserver/Segment.java  |   70 +-
 .../hadoop/hbase/regionserver/SegmentFactory.java  |   96 +-
 .../hadoop/hbase/regionserver/SegmentScanner.java  |  110 +-
 .../hadoop/hbase/regionserver/SequenceId.java      |    4 +-
 .../hbase/regionserver/ServerNonceManager.java     |   54 +-
 .../apache/hadoop/hbase/regionserver/Shipper.java  |    3 +-
 .../hadoop/hbase/regionserver/ShipperListener.java |    6 +-
 .../hadoop/hbase/regionserver/ShutdownHook.java    |  133 +-
 .../regionserver/SimpleRpcSchedulerFactory.java    |   29 +-
 .../hbase/regionserver/SnapshotRegionCallable.java |    9 +-
 .../hbase/regionserver/SnapshotSegmentScanner.java |   18 +-
 .../hbase/regionserver/SnapshotVerifyCallable.java |    8 +-
 .../hadoop/hbase/regionserver/SplitLogWorker.java  |   51 +-
 .../hadoop/hbase/regionserver/SplitRequest.java    |   25 +-
 .../hbase/regionserver/SplitWALCallable.java       |   21 +-
 .../hbase/regionserver/SteppingSplitPolicy.java    |   11 +-
 .../apache/hadoop/hbase/regionserver/Store.java    |   25 +-
 .../hbase/regionserver/StoreConfigInformation.java |   20 +-
 .../hadoop/hbase/regionserver/StoreContext.java    |    4 +-
 .../hadoop/hbase/regionserver/StoreEngine.java     |   37 +-
 .../hadoop/hbase/regionserver/StoreFile.java       |    3 +-
 .../hbase/regionserver/StoreFileComparators.java   |    2 +-
 .../hadoop/hbase/regionserver/StoreFileInfo.java   |  191 +-
 .../hbase/regionserver/StoreFileManager.java       |   56 +-
 .../hadoop/hbase/regionserver/StoreFileReader.java |  215 +-
 .../hbase/regionserver/StoreFileScanner.java       |  125 +-
 .../hadoop/hbase/regionserver/StoreFileWriter.java |  144 +-
 .../hbase/regionserver/StoreFlushContext.java      |   42 +-
 .../hadoop/hbase/regionserver/StoreFlusher.java    |   40 +-
 .../hadoop/hbase/regionserver/StoreScanner.java    |  291 +-
 .../hadoop/hbase/regionserver/StoreUtils.java      |   30 +-
 .../regionserver/StorefileRefresherChore.java      |   55 +-
 .../hbase/regionserver/StripeMultiFileWriter.java  |  111 +-
 .../hbase/regionserver/StripeStoreConfig.java      |   72 +-
 .../hbase/regionserver/StripeStoreEngine.java      |   25 +-
 .../hbase/regionserver/StripeStoreFileManager.java |  249 +-
 .../hbase/regionserver/StripeStoreFlusher.java     |   25 +-
 .../regionserver/ThreadSafeMemStoreSizing.java     |    7 +-
 .../hbase/regionserver/TimeRangeTracker.java       |   63 +-
 .../hbase/regionserver/VersionedSegmentsList.java  |   20 +-
 .../compactions/AbstractMultiOutputCompactor.java  |   12 +-
 .../regionserver/compactions/CloseChecker.java     |    8 +-
 .../compactions/CompactionConfiguration.java       |  124 +-
 .../compactions/CompactionContext.java             |   26 +-
 .../compactions/CompactionLifeCycleTracker.java    |    2 +-
 .../regionserver/compactions/CompactionPolicy.java |   15 +-
 .../compactions/CompactionProgress.java            |   32 +-
 .../compactions/CompactionRequest.java             |    6 +-
 .../compactions/CompactionRequestImpl.java         |   38 +-
 .../compactions/CompactionRequester.java           |   12 +-
 .../regionserver/compactions/CompactionWindow.java |    2 +-
 .../compactions/CompactionWindowFactory.java       |    2 +-
 .../hbase/regionserver/compactions/Compactor.java  |  161 +-
 .../compactions/CurrentHourProvider.java           |    2 +-
 .../compactions/DateTieredCompactionPolicy.java    |  102 +-
 .../compactions/DateTieredCompactionRequest.java   |   10 +-
 .../compactions/DateTieredCompactor.java           |   24 +-
 .../regionserver/compactions/DefaultCompactor.java |   10 +-
 .../compactions/ExploringCompactionPolicy.java     |   70 +-
 .../ExponentialCompactionWindowFactory.java        |   16 +-
 .../compactions/FIFOCompactionPolicy.java          |   42 +-
 .../regionserver/compactions/OffPeakHours.java     |   24 +-
 .../compactions/RatioBasedCompactionPolicy.java    |  100 +-
 .../compactions/SortedCompactionPolicy.java        |   92 +-
 .../compactions/StripeCompactionPolicy.java        |  177 +-
 .../regionserver/compactions/StripeCompactor.java  |   50 +-
 .../regionserver/handler/AssignRegionHandler.java  |   28 +-
 .../regionserver/handler/CloseMetaHandler.java     |    9 +-
 .../regionserver/handler/CloseRegionHandler.java   |   49 +-
 .../hbase/regionserver/handler/HandlerUtil.java    |    2 +-
 .../regionserver/handler/OpenMetaHandler.java      |    8 +-
 .../handler/OpenPriorityRegionHandler.java         |    7 +-
 .../regionserver/handler/OpenRegionHandler.java    |  126 +-
 .../regionserver/handler/ParallelSeekHandler.java  |   14 +-
 .../handler/RegionReplicaFlushHandler.java         |   78 +-
 .../handler/UnassignRegionHandler.java             |   38 +-
 .../regionserver/handler/WALSplitterHandler.java   |   71 +-
 .../hbase/regionserver/http/RSDumpServlet.java     |   31 +-
 .../hbase/regionserver/http/RSStatusServlet.java   |   24 +-
 .../regionserver/querymatcher/ColumnCount.java     |    7 +-
 .../regionserver/querymatcher/ColumnTracker.java   |   92 +-
 .../querymatcher/CompactionScanQueryMatcher.java   |   35 +-
 .../regionserver/querymatcher/DeleteTracker.java   |    8 +-
 .../DropDeletesCompactionScanQueryMatcher.java     |   14 +-
 .../querymatcher/ExplicitColumnTracker.java        |   15 +-
 .../IncludeAllCompactionQueryMatcher.java          |    9 +-
 .../MajorCompactionScanQueryMatcher.java           |    9 +-
 .../MinorCompactionScanQueryMatcher.java           |    7 +-
 .../querymatcher/NewVersionBehaviorTracker.java    |  102 +-
 .../querymatcher/NormalUserScanQueryMatcher.java   |   25 +-
 .../querymatcher/RawScanQueryMatcher.java          |   17 +-
 .../querymatcher/ScanDeleteTracker.java            |   21 +-
 .../querymatcher/ScanQueryMatcher.java             |   43 +-
 .../querymatcher/ScanWildcardColumnTracker.java    |   27 +-
 .../StripeCompactionScanQueryMatcher.java          |   20 +-
 .../querymatcher/UserScanQueryMatcher.java         |   40 +-
 .../snapshot/FlushSnapshotSubprocedure.java        |   61 +-
 .../snapshot/RegionServerSnapshotManager.java      |  176 +-
 .../storefiletracker/DefaultStoreFileTracker.java  |    3 +-
 .../FileBasedStoreFileTracker.java                 |    8 +-
 .../InitializeStoreFileTrackerProcedure.java       |    5 +-
 .../MigrationStoreFileTracker.java                 |    2 +-
 ...odifyColumnFamilyStoreFileTrackerProcedure.java |    2 +-
 .../ModifyStoreFileTrackerProcedure.java           |   12 +-
 .../ModifyTableStoreFileTrackerProcedure.java      |    2 +-
 .../storefiletracker/StoreFileListFile.java        |   10 +-
 .../storefiletracker/StoreFileTracker.java         |    2 +-
 .../storefiletracker/StoreFileTrackerBase.java     |   29 +-
 .../storefiletracker/StoreFileTrackerFactory.java  |   20 +-
 .../StoreFileTrackerValidationUtils.java           |   74 +-
 .../CompactionThroughputControllerFactory.java     |   30 +-
 .../throttle/FlushThroughputControllerFactory.java |   32 +-
 .../throttle/NoLimitThroughputController.java      |    4 +-
 ...ressureAwareCompactionThroughputController.java |   69 +-
 .../PressureAwareFlushThroughputController.java    |   59 +-
 .../PressureAwareThroughputController.java         |   35 +-
 .../throttle/StoreHotnessProtector.java            |   74 +-
 .../throttle/ThroughputControlUtil.java            |   11 +-
 .../throttle/ThroughputController.java             |    8 +-
 .../hbase/regionserver/wal/AbstractFSWAL.java      |  152 +-
 .../wal/AbstractProtobufLogWriter.java             |   52 +-
 .../hadoop/hbase/regionserver/wal/AsyncFSWAL.java  |   92 +-
 .../regionserver/wal/AsyncProtobufLogWriter.java   |   48 +-
 .../hbase/regionserver/wal/CompressionContext.java |   53 +-
 .../hadoop/hbase/regionserver/wal/Compressor.java  |   63 +-
 .../regionserver/wal/DamagedWALException.java      |    6 +-
 .../hadoop/hbase/regionserver/wal/FSHLog.java      |  200 +-
 .../hadoop/hbase/regionserver/wal/FSWALEntry.java  |   24 +-
 .../hadoop/hbase/regionserver/wal/MetricsWAL.java  |   23 +-
 .../hbase/regionserver/wal/ProtobufLogReader.java  |  154 +-
 .../hbase/regionserver/wal/ProtobufLogWriter.java  |   17 +-
 .../hadoop/hbase/regionserver/wal/ReaderBase.java  |   33 +-
 .../hbase/regionserver/wal/RingBufferTruck.java    |    7 +-
 .../wal/SecureAsyncProtobufLogWriter.java          |   11 +-
 .../regionserver/wal/SecureProtobufLogReader.java  |   20 +-
 .../regionserver/wal/SecureProtobufLogWriter.java  |    7 +-
 .../hbase/regionserver/wal/SecureWALCellCodec.java |   12 +-
 .../regionserver/wal/SequenceIdAccounting.java     |  121 +-
 .../hadoop/hbase/regionserver/wal/SyncFuture.java  |   21 +-
 .../hbase/regionserver/wal/SyncFutureCache.java    |   26 +-
 .../hbase/regionserver/wal/WALActionsListener.java |   61 +-
 .../hbase/regionserver/wal/WALCellCodec.java       |   92 +-
 .../hbase/regionserver/wal/WALCoprocessorHost.java |   46 +-
 .../hadoop/hbase/regionserver/wal/WALUtil.java     |   56 +-
 .../hbase/replication/BaseReplicationEndpoint.java |   37 +-
 .../hbase/replication/BulkLoadCellFilter.java      |   26 +-
 .../hbase/replication/ChainWALEntryFilter.java     |   11 +-
 .../replication/ClusterMarkingEntryFilter.java     |   31 +-
 .../replication/HBaseReplicationEndpoint.java      |   34 +-
 .../NamespaceTableCfWALEntryFilter.java            |    4 +-
 .../hbase/replication/ReplicationEndpoint.java     |  123 +-
 .../replication/ReplicationSinkServiceImpl.java    |   10 +-
 .../hbase/replication/ScopeWALEntryFilter.java     |    3 +-
 .../replication/SystemTableWALEntryFilter.java     |    4 +-
 .../VerifyWALEntriesReplicationEndpoint.java       |    2 +-
 .../hadoop/hbase/replication/WALCellFilter.java    |   14 +-
 .../hadoop/hbase/replication/WALEntryFilter.java   |   18 +-
 .../master/ReplicationHFileCleaner.java            |   18 +-
 .../replication/master/ReplicationLogCleaner.java  |   10 +-
 .../master/ReplicationPeerConfigUpgrader.java      |   21 +-
 .../regionserver/CatalogReplicationSourcePeer.java |   24 +-
 .../ClaimReplicationQueueCallable.java             |    2 +-
 .../DefaultSourceFSConfigurationProvider.java      |   35 +-
 .../regionserver/DumpReplicationQueues.java        |   57 +-
 .../HBaseInterClusterReplicationEndpoint.java      |  146 +-
 .../replication/regionserver/HFileReplicator.java  |   91 +-
 .../replication/regionserver/MetricsSink.java      |   31 +-
 .../replication/regionserver/MetricsSource.java    |   85 +-
 .../regionserver/NoopReplicationQueueStorage.java  |   42 +-
 .../regionserver/PeerProcedureHandler.java         |    3 +-
 .../regionserver/PeerProcedureHandlerImpl.java     |   10 +-
 .../regionserver/RecoveredReplicationSource.java   |   19 +-
 .../RecoveredReplicationSourceShipper.java         |   10 +-
 .../regionserver/RefreshPeerCallable.java          |    2 +-
 .../RegionReplicaReplicationEndpoint.java          |  178 +-
 .../replication/regionserver/Replication.java      |   63 +-
 .../replication/regionserver/ReplicationLoad.java  |   50 +-
 .../regionserver/ReplicationObserver.java          |   23 +-
 .../regionserver/ReplicationRuntimeException.java  |    8 +-
 .../replication/regionserver/ReplicationSink.java  |  156 +-
 .../regionserver/ReplicationSinkManager.java       |   56 +-
 .../regionserver/ReplicationSource.java            |  190 +-
 .../regionserver/ReplicationSourceFactory.java     |   17 +-
 .../regionserver/ReplicationSourceInterface.java   |   42 +-
 .../regionserver/ReplicationSourceLogQueue.java    |   25 +-
 .../regionserver/ReplicationSourceManager.java     |  162 +-
 .../regionserver/ReplicationSourceShipper.java     |   87 +-
 .../ReplicationSourceWALActionListener.java        |    9 +-
 .../regionserver/ReplicationSourceWALReader.java   |   80 +-
 .../regionserver/ReplicationStatus.java            |    2 +-
 .../regionserver/ReplicationSyncUp.java            |    8 +-
 .../regionserver/ReplicationThrottler.java         |   40 +-
 .../regionserver/SerialReplicationChecker.java     |   16 +-
 .../SerialReplicationSourceWALReader.java          |    8 +-
 .../SourceFSConfigurationProvider.java             |   28 +-
 .../SwitchRpcThrottleRemoteCallable.java           |    2 +-
 .../replication/regionserver/WALEntryBatch.java    |   11 +-
 .../WALEntryFilterRetryableException.java          |    9 +-
 .../regionserver/WALEntrySinkFilter.java           |   24 +-
 .../replication/regionserver/WALEntryStream.java   |   44 +-
 .../regionserver/WALFileLengthProvider.java        |   11 +-
 .../hadoop/hbase/security/HBasePolicyProvider.java |   24 +-
 .../hadoop/hbase/security/HBaseSaslRpcServer.java  |   10 +-
 .../apache/hadoop/hbase/security/SecurityUtil.java |    3 +-
 .../hbase/security/access/AccessChecker.java       |  251 +-
 .../hbase/security/access/AccessControlFilter.java |   69 +-
 .../hbase/security/access/AccessController.java    |  981 ++++---
 .../hadoop/hbase/security/access/AuthManager.java  |  140 +-
 .../hadoop/hbase/security/access/AuthResult.java   |   89 +-
 .../access/CoprocessorWhitelistMasterObserver.java |   73 +-
 .../hbase/security/access/NoopAccessChecker.java   |   21 +-
 .../hbase/security/access/PermissionStorage.java   |  237 +-
 .../access/SnapshotScannerHDFSAclCleaner.java      |    9 +-
 .../access/SnapshotScannerHDFSAclController.java   |  193 +-
 .../access/SnapshotScannerHDFSAclHelper.java       |  180 +-
 .../hbase/security/access/ZKPermissionWatcher.java |   41 +-
 .../AttemptingUserProvidingSaslServer.java         |   10 +-
 .../DigestSaslServerAuthenticationProvider.java    |   31 +-
 .../GssSaslServerAuthenticationProvider.java       |   27 +-
 .../provider/SaslServerAuthenticationProvider.java |   12 +-
 .../SaslServerAuthenticationProviders.java         |   47 +-
 .../SimpleSaslServerAuthenticationProvider.java    |   11 +-
 .../hbase/security/token/AuthenticationKey.java    |   28 +-
 .../token/AuthenticationTokenSecretManager.java    |  100 +-
 .../hbase/security/token/FsDelegationToken.java    |   24 +-
 .../hadoop/hbase/security/token/TokenProvider.java |   60 +-
 .../hadoop/hbase/security/token/TokenUtil.java     |  117 +-
 .../hbase/security/token/ZKSecretWatcher.java      |   68 +-
 .../DefaultVisibilityLabelServiceImpl.java         |  173 +-
 .../DefinedSetFilterScanLabelGenerator.java        |   18 +-
 .../visibility/EnforcingScanLabelGenerator.java    |   14 +-
 .../security/visibility/ExpressionExpander.java    |   33 +-
 .../security/visibility/ExpressionParser.java      |   75 +-
 .../visibility/FeedUserAuthScanLabelGenerator.java |   26 +-
 .../hbase/security/visibility/ParseException.java  |    2 +-
 .../security/visibility/ScanLabelGenerator.java    |   15 +-
 .../visibility/SimpleScanLabelGenerator.java       |    5 +-
 .../security/visibility/VisibilityController.java  |  220 +-
 .../visibility/VisibilityExpEvaluator.java         |    6 +-
 .../security/visibility/VisibilityLabelFilter.java |   30 +-
 .../visibility/VisibilityLabelOrdinalProvider.java |    2 +-
 .../visibility/VisibilityLabelService.java         |  121 +-
 .../visibility/VisibilityLabelServiceManager.java  |   23 +-
 .../security/visibility/VisibilityLabelsCache.java |   25 +-
 .../VisibilityNewVersionBehaivorTracker.java       |   69 +-
 .../security/visibility/VisibilityReplication.java |   20 +-
 .../visibility/VisibilityReplicationEndpoint.java  |   27 +-
 .../visibility/VisibilityScanDeleteTracker.java    |   70 +-
 .../hbase/security/visibility/VisibilityUtils.java |  102 +-
 .../visibility/ZKVisibilityLabelWatcher.java       |   27 +-
 .../visibility/expression/ExpressionNode.java      |    2 +-
 .../visibility/expression/LeafExpressionNode.java  |    2 +-
 .../expression/NonLeafExpressionNode.java          |    3 +-
 .../security/visibility/expression/Operator.java   |    6 +-
 .../hbase/server/trace/IpcServerSpanBuilder.java   |   25 +-
 .../hadoop/hbase/snapshot/CreateSnapshot.java      |   69 +-
 .../hbase/snapshot/RestoreSnapshotHelper.java      |  420 ++-
 .../hbase/snapshot/SnapshotDescriptionUtils.java   |  180 +-
 .../apache/hadoop/hbase/snapshot/SnapshotInfo.java |  327 ++-
 .../hadoop/hbase/snapshot/SnapshotManifest.java    |  157 +-
 .../hadoop/hbase/snapshot/SnapshotManifestV1.java  |   57 +-
 .../hadoop/hbase/snapshot/SnapshotManifestV2.java  |   51 +-
 .../hbase/snapshot/SnapshotReferenceUtil.java      |  164 +-
 .../apache/hadoop/hbase/tool/BulkLoadHFiles.java   |   14 +-
 .../hadoop/hbase/tool/BulkLoadHFilesTool.java      |   10 +-
 .../java/org/apache/hadoop/hbase/tool/Canary.java  |    8 +-
 .../hadoop/hbase/tool/CanaryStatusServlet.java     |    7 +-
 .../org/apache/hadoop/hbase/tool/CanaryTool.java   |  450 ++--
 .../hbase/tool/DataBlockEncodingValidator.java     |   17 +-
 .../hadoop/hbase/tool/HFileContentValidator.java   |    8 +-
 .../hadoop/hbase/tool/LoadIncrementalHFiles.java   |  402 +--
 .../hadoop/hbase/tool/PreUpgradeValidator.java     |   14 +-
 .../hadoop/hbase/tool/WriteSinkCoprocessor.java    |   32 +-
 .../coprocessor/Branch1CoprocessorMethods.java     | 1754 +++++--------
 .../hbase/tool/coprocessor/CoprocessorMethod.java  |   14 +-
 .../hbase/tool/coprocessor/CoprocessorMethods.java |   20 +-
 .../tool/coprocessor/CoprocessorValidator.java     |   67 +-
 .../tool/coprocessor/CoprocessorViolation.java     |   18 +-
 .../coprocessor/CurrentCoprocessorMethods.java     |    4 +-
 .../hbase/util/AbstractFileStatusFilter.java       |   28 +-
 .../org/apache/hadoop/hbase/util/BloomContext.java |   18 +-
 .../org/apache/hadoop/hbase/util/BloomFilter.java  |   82 +-
 .../apache/hadoop/hbase/util/BloomFilterBase.java  |    4 +-
 .../apache/hadoop/hbase/util/BloomFilterChunk.java |   80 +-
 .../hadoop/hbase/util/BloomFilterFactory.java      |  124 +-
 .../apache/hadoop/hbase/util/BloomFilterUtil.java  |  168 +-
 .../hadoop/hbase/util/BloomFilterWriter.java       |   15 +-
 .../hbase/util/BoundedPriorityBlockingQueue.java   |   61 +-
 .../hadoop/hbase/util/CollectionBackedScanner.java |   22 +-
 .../apache/hadoop/hbase/util/CompressionTest.java  |   59 +-
 .../hadoop/hbase/util/ConfigurationUtil.java       |   38 +-
 .../apache/hadoop/hbase/util/ConnectionCache.java  |   45 +-
 .../hbase/util/CoprocessorConfigurationUtil.java   |    2 +-
 .../hadoop/hbase/util/DirectMemoryUtils.java       |   44 +-
 .../apache/hadoop/hbase/util/EncryptionTest.java   |   69 +-
 .../apache/hadoop/hbase/util/FSRegionScanner.java  |   43 +-
 .../hadoop/hbase/util/FSTableDescriptors.java      |  172 +-
 .../java/org/apache/hadoop/hbase/util/FSUtils.java |  730 +++---
 .../org/apache/hadoop/hbase/util/FSVisitor.java    |   31 +-
 .../apache/hadoop/hbase/util/FileStatusFilter.java |   13 +-
 .../apache/hadoop/hbase/util/GetJavaProperty.java  |   12 +-
 .../apache/hadoop/hbase/util/HBaseConfTool.java    |    7 +-
 .../org/apache/hadoop/hbase/util/HBaseFsck.java    | 1230 ++++-----
 .../apache/hadoop/hbase/util/HBaseFsckRepair.java  |   92 +-
 .../apache/hadoop/hbase/util/HFileArchiveUtil.java |   32 +-
 .../org/apache/hadoop/hbase/util/HashedBytes.java  |   12 +-
 .../hadoop/hbase/util/HbckErrorReporter.java       |   51 +-
 .../apache/hadoop/hbase/util/HbckRegionInfo.java   |   37 +-
 .../apache/hadoop/hbase/util/HbckTableInfo.java    |  317 ++-
 .../apache/hadoop/hbase/util/IdReadWriteLock.java  |   11 +-
 .../apache/hadoop/hbase/util/JVMClusterUtil.java   |  149 +-
 .../apache/hadoop/hbase/util/JvmPauseMonitor.java  |   54 +-
 .../org/apache/hadoop/hbase/util/JvmVersion.java   |   10 +-
 .../org/apache/hadoop/hbase/util/KeyRange.java     |    3 +-
 .../hbase/util/LeaseNotRecoveredException.java     |   10 +-
 .../apache/hadoop/hbase/util/LossyCounting.java    |   41 +-
 .../hadoop/hbase/util/ManualEnvironmentEdge.java   |    5 +-
 .../hadoop/hbase/util/ModifyRegionUtils.java       |   95 +-
 .../org/apache/hadoop/hbase/util/MoveWithAck.java  |   29 +-
 .../apache/hadoop/hbase/util/MoveWithoutAck.java   |   11 +-
 .../apache/hadoop/hbase/util/MultiHConnection.java |   40 +-
 .../hadoop/hbase/util/MunkresAssignment.java       |   69 +-
 .../hbase/util/NettyEventLoopGroupConfig.java      |   11 +-
 .../org/apache/hadoop/hbase/util/RegionMover.java  |  161 +-
 .../hadoop/hbase/util/RegionSplitCalculator.java   |   90 +-
 .../apache/hadoop/hbase/util/RegionSplitter.java   |  507 ++--
 .../hadoop/hbase/util/RollingStatCalculator.java   |   60 +-
 .../apache/hadoop/hbase/util/RowBloomContext.java  |    3 +-
 .../hadoop/hbase/util/RowColBloomContext.java      |    7 +-
 .../util/RowPrefixFixedLengthBloomContext.java     |   13 +-
 .../hadoop/hbase/util/ServerCommandLine.java       |   52 +-
 .../hadoop/hbase/util/ServerRegionReplicaUtil.java |   88 +-
 .../hadoop/hbase/util/ShutdownHookManager.java     |   21 +-
 .../org/apache/hadoop/hbase/util/SortedList.java   |   48 +-
 .../apache/hadoop/hbase/util/StealJobQueue.java    |   29 +-
 .../hadoop/hbase/util/TableDescriptorChecker.java  |   83 +-
 .../hadoop/hbase/util/YammerHistogramUtils.java    |   68 +-
 .../apache/hadoop/hbase/util/ZKDataMigrator.java   |   74 +-
 .../util/compaction/ClusterCompactionQueues.java   |    8 +-
 .../util/compaction/MajorCompactionRequest.java    |   50 +-
 .../util/compaction/MajorCompactionTTLRequest.java |   14 +-
 .../hbase/util/compaction/MajorCompactor.java      |  215 +-
 .../hbase/util/compaction/MajorCompactorTTL.java   |   33 +-
 .../hbase/util/hbck/HFileCorruptionChecker.java    |  144 +-
 .../hadoop/hbase/util/hbck/OfflineMetaRepair.java  |    9 +-
 .../hadoop/hbase/util/hbck/ReplicationChecker.java |   20 +-
 .../util/hbck/TableIntegrityErrorHandler.java      |   52 +-
 .../util/hbck/TableIntegrityErrorHandlerImpl.java  |   19 +-
 .../hadoop/hbase/wal/AbstractFSWALProvider.java    |   36 +-
 .../wal/AbstractRecoveredEditsOutputSink.java      |   44 +-
 .../apache/hadoop/hbase/wal/AbstractWALRoller.java |   29 +-
 .../hadoop/hbase/wal/AsyncFSWALProvider.java       |   43 +-
 .../hadoop/hbase/wal/BoundedEntryBuffers.java      |   11 +-
 .../hadoop/hbase/wal/BoundedGroupingStrategy.java  |    8 +-
 .../hbase/wal/BoundedRecoveredEditsOutputSink.java |   20 +-
 .../wal/BoundedRecoveredHFilesOutputSink.java      |   36 +-
 .../hadoop/hbase/wal/DisabledWALProvider.java      |   31 +-
 .../org/apache/hadoop/hbase/wal/EntryBuffers.java  |   10 +-
 .../apache/hadoop/hbase/wal/FSHLogProvider.java    |   37 +-
 .../hbase/wal/NamespaceGroupingStrategy.java       |   11 +-
 .../hbase/wal/NettyAsyncFSWALConfigHelper.java     |   11 +-
 .../org/apache/hadoop/hbase/wal/OutputSink.java    |   18 +-
 .../hadoop/hbase/wal/RecoveredEditsOutputSink.java |   23 +-
 .../hadoop/hbase/wal/RegionGroupingProvider.java   |   48 +-
 .../main/java/org/apache/hadoop/hbase/wal/WAL.java |  161 +-
 .../java/org/apache/hadoop/hbase/wal/WALEdit.java  |  194 +-
 .../org/apache/hadoop/hbase/wal/WALFactory.java    |  131 +-
 .../java/org/apache/hadoop/hbase/wal/WALKey.java   |   49 +-
 .../org/apache/hadoop/hbase/wal/WALKeyImpl.java    |  349 +--
 .../apache/hadoop/hbase/wal/WALPrettyPrinter.java  |  177 +-
 .../org/apache/hadoop/hbase/wal/WALProvider.java   |   33 +-
 .../org/apache/hadoop/hbase/wal/WALSplitUtil.java  |  102 +-
 .../org/apache/hadoop/hbase/wal/WALSplitter.java   |  113 +-
 hbase-server/src/main/python/hbase/merge_conf.py   |    1 -
 .../hadoop/hbase/AcidGuaranteesTestBase.java       |   10 +-
 .../hadoop/hbase/AcidGuaranteesTestTool.java       |   19 +-
 .../hbase/ClearUserNamespacesAndTablesRule.java    |   91 +-
 .../org/apache/hadoop/hbase/ConnectionRule.java    |   33 +-
 .../org/apache/hadoop/hbase/GenericTestUtils.java  |   87 +-
 .../java/org/apache/hadoop/hbase/HBaseCluster.java |  159 +-
 .../org/apache/hadoop/hbase/HBaseTestCase.java     |  224 +-
 .../apache/hadoop/hbase/HBaseTestingUtility.java   | 2105 +++++++--------
 .../hadoop/hbase/HFilePerformanceEvaluation.java   |  193 +-
 .../java/org/apache/hadoop/hbase/HTestConst.java   |   25 +-
 .../org/apache/hadoop/hbase/MetaMockingUtil.java   |   67 +-
 .../org/apache/hadoop/hbase/MiniClusterRule.java   |   22 +-
 .../org/apache/hadoop/hbase/MiniHBaseCluster.java  |  280 +-
 .../hadoop/hbase/MockRegionServerServices.java     |   14 +-
 .../apache/hadoop/hbase/MultithreadedTestUtil.java |   32 +-
 .../hadoop/hbase/PerformanceEvaluationCommons.java |   34 +-
 .../org/apache/hadoop/hbase/ProcedureTestUtil.java |    8 +-
 .../org/apache/hadoop/hbase/QosTestHelper.java     |   16 +-
 .../hadoop/hbase/StartMiniClusterOption.java       |   20 +-
 .../TestAcidGuaranteesWithAdaptivePolicy.java      |    4 +-
 .../hbase/TestAcidGuaranteesWithBasicPolicy.java   |    4 +-
 .../hbase/TestAcidGuaranteesWithEagerPolicy.java   |    2 +-
 .../TestAcidGuaranteesWithNoInMemCompaction.java   |    2 +-
 .../apache/hadoop/hbase/TestCachedClusterId.java   |    8 +-
 .../apache/hadoop/hbase/TestCheckTestClasses.java  |   11 +-
 .../hadoop/hbase/TestClientClusterMetrics.java     |  162 +-
 .../hadoop/hbase/TestClientClusterStatus.java      |   40 +-
 .../hadoop/hbase/TestClientOperationTimeout.java   |   14 +-
 .../apache/hadoop/hbase/TestClusterBootOrder.java  |   22 +-
 .../hadoop/hbase/TestClusterPortAssignment.java    |   14 +-
 .../hbase/TestFSTableDescriptorForceCreation.java  |   22 +-
 .../hadoop/hbase/TestFullLogReconstruction.java    |    4 +-
 .../hadoop/hbase/TestGlobalMemStoreSize.java       |   66 +-
 .../org/apache/hadoop/hbase/TestHBaseMetaEdit.java |   43 +-
 .../hadoop/hbase/TestHBaseOnOtherDfsCluster.java   |    8 +-
 .../hadoop/hbase/TestHBaseTestingUtility.java      |   99 +-
 .../TestHColumnDescriptorDefaultVersions.java      |   14 +-
 .../hadoop/hbase/TestHDFSBlocksDistribution.java   |   42 +-
 .../apache/hadoop/hbase/TestHRegionLocation.java   |   24 +-
 .../org/apache/hadoop/hbase/TestIOFencing.java     |  109 +-
 .../hbase/TestIPv6NIOServerSocketChannel.java      |   56 +-
 .../org/apache/hadoop/hbase/TestInfoServers.java   |   31 +-
 .../hadoop/hbase/TestJMXConnectorServer.java       |    8 +-
 .../org/apache/hadoop/hbase/TestJMXListener.java   |   26 +-
 .../apache/hadoop/hbase/TestLocalHBaseCluster.java |   27 +-
 .../apache/hadoop/hbase/TestMetaTableAccessor.java |  373 +--
 .../hbase/TestMetaTableAccessorNoCluster.java      |  111 +-
 .../apache/hadoop/hbase/TestMetaTableLocator.java  |    4 +-
 .../apache/hadoop/hbase/TestMovedRegionCache.java  |   15 +-
 .../org/apache/hadoop/hbase/TestMultiVersions.java |   79 +-
 .../org/apache/hadoop/hbase/TestNamespace.java     |   74 +-
 .../hadoop/hbase/TestNodeHealthCheckChore.java     |   19 +-
 .../hbase/TestPartialResultsFromClientSide.java    |  174 +-
 .../org/apache/hadoop/hbase/TestRegionLoad.java    |   71 +-
 .../org/apache/hadoop/hbase/TestRegionMetrics.java |   42 +-
 .../apache/hadoop/hbase/TestRegionRebalancing.java |   99 +-
 .../TestSequenceIdMonotonicallyIncreasing.java     |    6 +-
 .../org/apache/hadoop/hbase/TestSerialization.java |  347 +--
 .../org/apache/hadoop/hbase/TestServerLoad.java    |    9 +-
 .../org/apache/hadoop/hbase/TestServerMetrics.java |   71 +-
 .../TestServerSideScanMetricsFromClientSide.java   |   38 +-
 .../java/org/apache/hadoop/hbase/TestSize.java     |   22 +-
 .../org/apache/hadoop/hbase/TestSplitMerge.java    |   18 +-
 .../apache/hadoop/hbase/TestTagRewriteCell.java    |   15 +-
 .../org/apache/hadoop/hbase/TestZooKeeper.java     |   46 +-
 .../org/apache/hadoop/hbase/TimestampTestBase.java |  142 +-
 .../hadoop/hbase/backup/TestHFileArchiving.java    |  123 +-
 .../example/TestZooKeeperTableArchiveClient.java   |   50 +-
 .../AbstractTestAsyncTableRegionReplicasRead.java  |    8 +-
 .../hbase/client/AbstractTestAsyncTableScan.java   |   53 +-
 .../client/AbstractTestCIOperationTimeout.java     |    8 +-
 .../hbase/client/AbstractTestCIRpcTimeout.java     |   12 +-
 .../hadoop/hbase/client/AbstractTestCITimeout.java |   18 +-
 .../hbase/client/AbstractTestRegionLocator.java    |   10 +-
 .../client/AbstractTestResultScannerCursor.java    |   11 +-
 .../hbase/client/AbstractTestScanCursor.java       |   17 +-
 .../client/AbstractTestUpdateConfiguration.java    |   33 +-
 .../hbase/client/BufferingScanResultConsumer.java  |    7 +-
 .../hbase/client/ClientPushbackTestBase.java       |    8 +-
 ...shotFromClientAfterSplittingRegionTestBase.java |    4 +-
 ...hotFromClientCloneLinksAfterDeleteTestBase.java |    4 +-
 .../CloneSnapshotFromClientErrorTestBase.java      |    2 +-
 .../CloneSnapshotFromClientNormalTestBase.java     |    4 +-
 .../client/CloneSnapshotFromClientTestBase.java    |    4 +-
 .../hbase/client/ColumnCountOnRowFilter.java       |    5 +-
 .../hadoop/hbase/client/FromClientSideBase.java    |  599 ++---
 .../hbase/client/HConnectionTestingUtility.java    |  143 +-
 .../hbase/client/MetaWithReplicasTestBase.java     |    2 +-
 .../hbase/client/RegionReplicaTestHelper.java      |   17 +-
 ...hotFromClientAfterSplittingRegionsTestBase.java |    4 +-
 ...oreSnapshotFromClientAfterTruncateTestBase.java |    4 +-
 .../RestoreSnapshotFromClientCloneTestBase.java    |    2 +-
 ...apshotFromClientGetCompactionStateTestBase.java |    6 +-
 ...toreSnapshotFromClientSchemaChangeTestBase.java |    4 +-
 .../RestoreSnapshotFromClientSimpleTestBase.java   |    2 +-
 .../client/RestoreSnapshotFromClientTestBase.java  |    4 +-
 .../hbase/client/SnapshotWithAclTestBase.java      |   15 +-
 .../org/apache/hadoop/hbase/client/TestAdmin.java  |   15 +-
 .../org/apache/hadoop/hbase/client/TestAdmin1.java |   31 +-
 .../org/apache/hadoop/hbase/client/TestAdmin2.java |  187 +-
 .../org/apache/hadoop/hbase/client/TestAdmin3.java |   21 +-
 .../org/apache/hadoop/hbase/client/TestAdmin4.java |   14 +-
 .../apache/hadoop/hbase/client/TestAdminBase.java  |    2 +-
 .../client/TestAllowPartialScanResultCache.java    |    6 +-
 .../hbase/client/TestAlwaysSetScannerId.java       |    4 +-
 .../hbase/client/TestAppendFromClientSide.java     |   10 +-
 .../client/TestAsyncAccessControlAdminApi.java     |   53 +-
 .../hadoop/hbase/client/TestAsyncAdminBase.java    |   19 +-
 .../hadoop/hbase/client/TestAsyncAdminBuilder.java |   28 +-
 .../hbase/client/TestAsyncAdminMasterSwitch.java   |    2 +-
 .../TestAsyncAdminModifyStoreFileTracker.java      |    2 +-
 .../client/TestAsyncAdminWithRegionReplicas.java   |   10 +-
 .../hbase/client/TestAsyncBufferMutator.java       |    9 +-
 .../TestAsyncClientPauseForServerOverloaded.java   |   13 +-
 .../hbase/client/TestAsyncClientPushback.java      |    2 +-
 .../hbase/client/TestAsyncClusterAdminApi.java     |   58 +-
 .../hbase/client/TestAsyncClusterAdminApi2.java    |    4 +-
 .../client/TestAsyncDecommissionAdminApi.java      |   15 +-
 .../hbase/client/TestAsyncMetaRegionLocator.java   |    4 +-
 .../hbase/client/TestAsyncNamespaceAdminApi.java   |   11 +-
 .../client/TestAsyncNonMetaRegionLocator.java      |   20 +-
 ...stAsyncNonMetaRegionLocatorConcurrenyLimit.java |   22 +-
 .../hbase/client/TestAsyncProcedureAdminApi.java   |    5 +-
 .../hbase/client/TestAsyncQuotaAdminApi.java       |   40 +-
 .../hbase/client/TestAsyncRegionAdminApi.java      |  113 +-
 .../hbase/client/TestAsyncRegionAdminApi2.java     |   51 +-
 .../hbase/client/TestAsyncRegionLocator.java       |    6 +-
 .../hbase/client/TestAsyncReplicationAdminApi.java |    6 +-
 .../TestAsyncReplicationAdminApiWithClusters.java  |   20 +-
 .../hbase/client/TestAsyncResultScannerCursor.java |    2 +-
 .../TestAsyncSingleRequestRpcRetryingCaller.java   |    6 +-
 .../hbase/client/TestAsyncSnapshotAdminApi.java    |   19 +-
 .../apache/hadoop/hbase/client/TestAsyncTable.java |  555 ++--
 .../hbase/client/TestAsyncTableAdminApi.java       |   52 +-
 .../hbase/client/TestAsyncTableAdminApi2.java      |   21 +-
 .../hbase/client/TestAsyncTableAdminApi3.java      |   31 +-
 .../hadoop/hbase/client/TestAsyncTableBatch.java   |  148 +-
 .../TestAsyncTableBatchRetryImmediately.java       |    2 +-
 .../client/TestAsyncTableGetMultiThreaded.java     |   26 +-
 ...ncTableGetMultiThreadedWithBasicCompaction.java |    8 +-
 ...ncTableGetMultiThreadedWithEagerCompaction.java |    8 +-
 .../hbase/client/TestAsyncTableLocatePrefetch.java |    2 +-
 .../TestAsyncTableLocateRegionForDeletedTable.java |    2 +-
 .../hbase/client/TestAsyncTableNoncedRetry.java    |  119 +-
 .../hbase/client/TestAsyncTableRSCrashPublish.java |   34 +-
 .../hbase/client/TestAsyncTableRegionLocator.java  |    6 +-
 .../client/TestAsyncTableRegionReplicasGet.java    |    2 +-
 .../client/TestAsyncTableRegionReplicasScan.java   |    2 +-
 .../hadoop/hbase/client/TestAsyncTableScan.java    |   46 +-
 .../hadoop/hbase/client/TestAsyncTableScanAll.java |   22 +-
 .../hbase/client/TestAsyncTableScanException.java  |    4 +-
 .../hbase/client/TestAsyncTableScanMetrics.java    |   14 +-
 .../hbase/client/TestAsyncTableScanRenewLease.java |    6 +-
 .../hadoop/hbase/client/TestAsyncTableScanner.java |   20 +-
 .../TestAsyncTableScannerCloseWhileSuspending.java |    9 +-
 .../client/TestAsyncTableUseMetaReplicas.java      |   14 +-
 .../hadoop/hbase/client/TestAsyncToolAdminApi.java |    4 +-
 .../TestAvoidCellReferencesIntoShippedBlocks.java  |   16 +-
 .../hbase/client/TestBatchScanResultCache.java     |   26 +-
 .../hbase/client/TestBlockEvictionFromClient.java  |  132 +-
 .../hbase/client/TestCIDeleteOperationTimeout.java |    4 +-
 .../hbase/client/TestCIDeleteRpcTimeout.java       |    4 +-
 .../hbase/client/TestCIGetOperationTimeout.java    |    4 +-
 .../hadoop/hbase/client/TestCIGetRpcTimeout.java   |    4 +-
 .../hbase/client/TestCIIncrementRpcTimeout.java    |    4 +-
 .../hbase/client/TestCIPutOperationTimeout.java    |    4 +-
 .../hadoop/hbase/client/TestCIPutRpcTimeout.java   |    4 +-
 .../apache/hadoop/hbase/client/TestCISleep.java    |   15 +-
 ...estCatalogReplicaLoadBalanceSimpleSelector.java |   60 +-
 .../hadoop/hbase/client/TestCheckAndMutate.java    |  440 ++--
 .../client/TestCheckAndMutateWithByteBuff.java     |   27 +-
 .../hbase/client/TestCleanupMetaReplica.java       |    2 +-
 .../TestCleanupMetaReplicaThroughConfig.java       |    2 +-
 .../hbase/client/TestClientOperationInterrupt.java |   21 +-
 .../hadoop/hbase/client/TestClientPushback.java    |    2 +-
 .../hbase/client/TestClientScannerRPCTimeout.java  |   26 +-
 .../hbase/client/TestClientSideRegionScanner.java  |    5 +-
 .../hadoop/hbase/client/TestClientTimeouts.java    |   50 +-
 ...loneSnapshotFromClientAfterSplittingRegion.java |    4 +-
 ...oneSnapshotFromClientCloneLinksAfterDelete.java |    4 +-
 .../TestCloneSnapshotFromClientCustomSFT.java      |    8 +-
 .../client/TestCloneSnapshotFromClientError.java   |    2 +-
 .../client/TestCloneSnapshotFromClientNormal.java  |    2 +-
 .../client/TestCompleteResultScanResultCache.java  |    6 +-
 .../hbase/client/TestConnectionImplementation.java |  310 ++-
 .../hadoop/hbase/client/TestConnectionUtils.java   |   12 +-
 .../hbase/client/TestDropTimeoutRequest.java       |   17 +-
 .../hadoop/hbase/client/TestEnableTable.java       |   41 +-
 .../client/TestFailedMetaReplicaAssigment.java     |    2 +-
 .../apache/hadoop/hbase/client/TestFastFail.java   |  123 +-
 .../hadoop/hbase/client/TestFlushFromClient.java   |   37 +-
 .../hadoop/hbase/client/TestFromClientSide.java    |  216 +-
 .../hadoop/hbase/client/TestFromClientSide3.java   |  247 +-
 .../hadoop/hbase/client/TestFromClientSide4.java   |  185 +-
 .../hadoop/hbase/client/TestFromClientSide5.java   |  764 +++---
 .../hbase/client/TestFromClientSideNoCodec.java    |   21 +-
 .../client/TestFromClientSideScanExcpetion.java    |   31 +-
 ...FromClientSideScanExcpetionWithCoprocessor.java |    6 +-
 .../client/TestFromClientSideWithCoprocessor.java  |   13 +-
 .../client/TestFromClientSideWithCoprocessor4.java |   12 +-
 .../client/TestFromClientSideWithCoprocessor5.java |    8 +-
 .../hbase/client/TestGetProcedureResult.java       |   14 +-
 .../TestGetScanColumnsWithNewVersionBehavior.java  |   27 +-
 .../hbase/client/TestGetScanPartialResult.java     |    2 +-
 .../hbase/client/TestHBaseAdminNoCluster.java      |  115 +-
 .../hadoop/hbase/client/TestHTableMultiplexer.java |   34 +-
 .../client/TestHTableMultiplexerFlushCache.java    |   26 +-
 .../hadoop/hbase/client/TestHTableNoncedRetry.java |   78 +-
 .../org/apache/hadoop/hbase/client/TestHbck.java   |   35 +-
 .../hbase/client/TestIllegalTableDescriptor.java   |   17 +-
 .../TestIncreaseMetaReplicaThroughConfig.java      |    2 +-
 ...TestIncrementFromClientSideWithCoprocessor.java |   14 +-
 .../hbase/client/TestIncrementsFromClientSide.java |  123 +-
 .../hbase/client/TestIntraRowPagination.java       |   26 +-
 .../hadoop/hbase/client/TestLeaseRenewal.java      |   14 +-
 .../hbase/client/TestLimitedScanWithFilter.java    |   26 +-
 .../hbase/client/TestMalformedCellFromClient.java  |   37 +-
 .../apache/hadoop/hbase/client/TestMetaCache.java  |  110 +-
 .../hbase/client/TestMetaRegionLocationCache.java  |   34 +-
 .../client/TestMetaReplicasAddressChange.java      |    2 +-
 .../hbase/client/TestMetaWithReplicasBasic.java    |    2 +-
 .../TestMetaWithReplicasShutdownHandling.java      |    2 +-
 ...loneSnapshotFromClientAfterSplittingRegion.java |    4 +-
 ...oneSnapshotFromClientCloneLinksAfterDelete.java |   12 +-
 .../TestMobCloneSnapshotFromClientError.java       |    2 +-
 .../TestMobCloneSnapshotFromClientNormal.java      |    4 +-
 ...oreSnapshotFromClientAfterSplittingRegions.java |    6 +-
 ...tMobRestoreSnapshotFromClientAfterTruncate.java |    6 +-
 .../TestMobRestoreSnapshotFromClientClone.java     |    4 +-
 ...estoreSnapshotFromClientGetCompactionState.java |    6 +-
 ...stMobRestoreSnapshotFromClientSchemaChange.java |    6 +-
 .../TestMobRestoreSnapshotFromClientSimple.java    |    6 +-
 .../client/TestMobSnapshotCloneIndependence.java   |    4 +-
 .../hbase/client/TestMobSnapshotFromClient.java    |    6 +-
 .../client/TestMultiActionMetricsFromClient.java   |    7 +-
 .../hadoop/hbase/client/TestMultiParallel.java     |   91 +-
 .../hbase/client/TestMultiRespectsLimits.java      |   43 +-
 .../hbase/client/TestMultipleTimestamps.java       |  227 +-
 .../hbase/client/TestMvccConsistentScanner.java    |   13 +-
 .../client/TestPutDeleteEtcCellIteration.java      |   42 +-
 .../hadoop/hbase/client/TestPutWithDelete.java     |   27 +-
 .../hbase/client/TestRawAsyncScanCursor.java       |   10 +-
 .../TestRawAsyncTableLimitedScanWithFilter.java    |   18 +-
 .../hbase/client/TestRawAsyncTablePartialScan.java |   17 +-
 .../hadoop/hbase/client/TestRawAsyncTableScan.java |   40 +-
 .../hbase/client/TestRegionLocationCaching.java    |   16 +-
 .../hadoop/hbase/client/TestRegionLocator.java     |    6 +-
 .../hbase/client/TestReplicaWithCluster.java       |  148 +-
 .../hadoop/hbase/client/TestReplicasClient.java    |   49 +-
 .../hbase/client/TestRequestTooBigException.java   |    3 +-
 ...oreSnapshotFromClientAfterSplittingRegions.java |    4 +-
 ...TestRestoreSnapshotFromClientAfterTruncate.java |    4 +-
 .../client/TestRestoreSnapshotFromClientClone.java |    2 +-
 ...estoreSnapshotFromClientGetCompactionState.java |    4 +-
 .../TestRestoreSnapshotFromClientSchemaChange.java |    4 +-
 .../TestRestoreSnapshotFromClientSimple.java       |    2 +-
 .../org/apache/hadoop/hbase/client/TestResult.java |   96 +-
 .../hbase/client/TestResultFromCoprocessor.java    |   18 +-
 .../hbase/client/TestResultScannerCursor.java      |    4 +-
 .../hbase/client/TestResultScannerTracing.java     |   60 +-
 .../hbase/client/TestResultSizeEstimation.java     |   33 +-
 .../hbase/client/TestRpcConnectionRegistry.java    |    2 +-
 .../hbase/client/TestScanWithoutFetchingData.java  |    6 +-
 .../hadoop/hbase/client/TestScannerTimeout.java    |   41 +-
 .../hbase/client/TestScannersFromClientSide.java   |  215 +-
 .../hbase/client/TestScannersFromClientSide2.java  |   18 +-
 .../hbase/client/TestSeparateClientZKCluster.java  |    3 +-
 .../hbase/client/TestServerBusyException.java      |   77 +-
 .../hbase/client/TestServerLoadDurability.java     |   13 +-
 .../hbase/client/TestShortCircuitConnection.java   |    7 +-
 .../client/TestShutdownOfMetaReplicaHolder.java    |    2 +-
 .../hadoop/hbase/client/TestSizeFailures.java      |   25 +-
 .../hbase/client/TestSmallReversedScanner.java     |   18 +-
 .../client/TestSnapshotCloneIndependence.java      |   16 +-
 .../client/TestSnapshotDFSTemporaryDirectory.java  |   20 +-
 .../hbase/client/TestSnapshotFromClient.java       |   49 +-
 .../TestSnapshotFromClientWithRegionReplicas.java  |    6 +-
 .../hadoop/hbase/client/TestSnapshotMetadata.java  |   46 +-
 .../client/TestSnapshotTemporaryDirectory.java     |   67 +-
 ...apshotTemporaryDirectoryWithRegionReplicas.java |    6 +-
 .../hadoop/hbase/client/TestSnapshotWithAcl.java   |    4 +-
 .../client/TestSnapshotWithAclAsyncAdmin.java      |    4 +-
 .../hbase/client/TestSplitOrMergeAtTableLevel.java |   33 +-
 .../hbase/client/TestSplitOrMergeStatus.java       |   39 +-
 .../hadoop/hbase/client/TestTableFavoredNodes.java |   84 +-
 .../hbase/client/TestTableOperationException.java  |   40 +-
 .../hbase/client/TestTableSnapshotScanner.java     |   90 +-
 .../client/TestTableSnapshotScannerWithSFT.java    |    4 +-
 .../hadoop/hbase/client/TestTimestampsFilter.java  |  133 +-
 .../hbase/client/TestUpdateConfiguration.java      |   12 +-
 .../hbase/client/TestZKConnectionRegistry.java     |   31 +-
 .../hbase/client/hamcrest/BytesMatchers.java       |   13 +-
 .../hbase/client/locking/TestEntityLocks.java      |   47 +-
 .../client/replication/TestReplicationAdmin.java   |   40 +-
 .../TestReplicationAdminWithClusters.java          |   19 +-
 ...ReplicationAdminWithTwoDifferentZKClusters.java |    4 +-
 .../hadoop/hbase/codec/CodecPerformance.java       |   52 +-
 .../hadoop/hbase/codec/TestCellMessageCodec.java   |   18 +-
 .../hadoop/hbase/constraint/AllFailConstraint.java |    2 +-
 .../hadoop/hbase/constraint/AllPassConstraint.java |    2 +-
 .../constraint/CheckConfigurationConstraint.java   |   16 +-
 .../hbase/constraint/RuntimeFailConstraint.java    |    5 +-
 .../hadoop/hbase/constraint/TestConstraint.java    |   30 +-
 .../hadoop/hbase/constraint/TestConstraints.java   |   62 +-
 .../hadoop/hbase/constraint/WorksConstraint.java   |    7 +-
 .../coprocessor/SampleRegionWALCoprocessor.java    |   56 +-
 .../hbase/coprocessor/SimpleRegionObserver.java    |  260 +-
 .../hbase/coprocessor/TestAppendTimeRange.java     |   33 +-
 .../coprocessor/TestCoprocessorConfiguration.java  |   54 +-
 .../hbase/coprocessor/TestCoprocessorHost.java     |   39 +-
 .../coprocessor/TestCoprocessorInterface.java      |  130 +-
 .../hbase/coprocessor/TestCoprocessorMetrics.java  |  202 +-
 .../TestCoprocessorShortCircuitRPC.java            |   12 +-
 .../hbase/coprocessor/TestCoprocessorStop.java     |   23 +-
 .../coprocessor/TestCoreMasterCoprocessor.java     |   33 +-
 .../coprocessor/TestCoreRegionCoprocessor.java     |   32 +-
 .../TestCoreRegionServerCoprocessor.java           |   29 +-
 .../TestIncrementAndAppendWithNullResult.java      |   41 +-
 .../hbase/coprocessor/TestIncrementTimeRange.java  |   42 +-
 .../TestMasterCoprocessorExceptionWithAbort.java   |   73 +-
 .../TestMasterCoprocessorExceptionWithRemove.java  |   55 +-
 .../hbase/coprocessor/TestMasterObserver.java      |  521 ++--
 .../TestMasterObserverToModifyTableSchema.java     |   27 +-
 .../hbase/coprocessor/TestMetaTableMetrics.java    |   46 +-
 ...estNegativeMemStoreSizeWithSlowCoprocessor.java |    8 +-
 .../coprocessor/TestOpenTableInCoprocessor.java    |   32 +-
 .../TestPassCustomCellViaRegionObserver.java       |   34 +-
 .../TestPostIncrementAndAppendBeforeWAL.java       |   97 +-
 .../coprocessor/TestReadOnlyConfiguration.java     |    4 +-
 .../coprocessor/TestRegionCoprocessorHost.java     |   22 +-
 .../coprocessor/TestRegionObserverBypass.java      |   81 +-
 ...ObserverForAddingMutationsFromCoprocessors.java |   88 +-
 .../coprocessor/TestRegionObserverInterface.java   |  212 +-
 .../TestRegionObserverPreFlushAndPreCompact.java   |   23 +-
 .../TestRegionObserverScannerOpenHook.java         |   38 +-
 .../coprocessor/TestRegionObserverStacking.java    |   52 +-
 ...tRegionServerCoprocessorExceptionWithAbort.java |   31 +-
 ...RegionServerCoprocessorExceptionWithRemove.java |   34 +-
 .../hadoop/hbase/coprocessor/TestWALObserver.java  |   96 +-
 .../TestForeignExceptionDispatcher.java            |   16 +-
 .../TestForeignExceptionSerialization.java         |   18 +-
 .../TestTimeoutExceptionInjector.java              |   10 +-
 .../hadoop/hbase/executor/TestExecutorService.java |   48 +-
 .../favored/TestFavoredNodeAssignmentHelper.java   |  170 +-
 .../favored/TestStartcodeAgnosticServerName.java   |   10 +-
 .../hadoop/hbase/filter/FilterAllFilter.java       |    7 +-
 .../hadoop/hbase/filter/FilterTestingCluster.java  |   11 +-
 .../hbase/filter/TestBigDecimalComparator.java     |    4 +-
 .../hadoop/hbase/filter/TestBitComparator.java     |   31 +-
 .../hbase/filter/TestColumnPaginationFilter.java   |  123 +-
 .../hbase/filter/TestColumnPrefixFilter.java       |   40 +-
 .../hadoop/hbase/filter/TestColumnRangeFilter.java |   59 +-
 .../hbase/filter/TestComparatorSerialization.java  |   10 +-
 .../hbase/filter/TestDependentColumnFilter.java    |  109 +-
 .../org/apache/hadoop/hbase/filter/TestFilter.java | 1501 +++++------
 .../hbase/filter/TestFilterFromRegionSide.java     |   26 +-
 .../apache/hadoop/hbase/filter/TestFilterList.java |  301 +--
 .../hadoop/hbase/filter/TestFilterListOnMini.java  |   37 +-
 .../filter/TestFilterListOrOperatorWithBlkCnt.java |   21 +-
 .../hbase/filter/TestFilterSerialization.java      |  177 +-
 .../hbase/filter/TestFilterWithScanLimits.java     |   14 +-
 .../hadoop/hbase/filter/TestFilterWrapper.java     |   18 +-
 .../TestFiltersWithBinaryComponentComparator.java  |  176 +-
 .../TestFirstKeyValueMatchingQualifiersFilter.java |   21 +-
 .../filter/TestFuzzyRowAndColumnRangeFilter.java   |   30 +-
 .../hadoop/hbase/filter/TestFuzzyRowFilter.java    |  533 ++--
 .../hbase/filter/TestFuzzyRowFilterEndToEnd.java   |   55 +-
 .../hbase/filter/TestInclusiveStopFilter.java      |   19 +-
 .../hbase/filter/TestInvocationRecordFilter.java   |   56 +-
 .../hbase/filter/TestMultiRowRangeFilter.java      |  118 +-
 .../filter/TestMultipleColumnPrefixFilter.java     |   63 +-
 .../hadoop/hbase/filter/TestNullComparator.java    |    9 +-
 .../apache/hadoop/hbase/filter/TestPageFilter.java |   17 +-
 .../hadoop/hbase/filter/TestParseFilter.java       |  184 +-
 .../hadoop/hbase/filter/TestPrefixFilter.java      |   22 +-
 .../TestQualifierFilterWithEmptyQualifier.java     |   63 +-
 .../hadoop/hbase/filter/TestRandomRowFilter.java   |   25 +-
 .../hadoop/hbase/filter/TestRegexComparator.java   |  161 +-
 .../hadoop/hbase/filter/TestScanRowPrefix.java     |   70 +-
 .../apache/hadoop/hbase/filter/TestSeekHints.java  |   32 +-
 .../filter/TestSingleColumnValueExcludeFilter.java |   26 +-
 .../hbase/filter/TestSingleColumnValueFilter.java  |   87 +-
 .../apache/hadoop/hbase/fs/TestBlockReorder.java   |   61 +-
 .../hbase/fs/TestBlockReorderBlockLocation.java    |   32 +-
 .../hbase/fs/TestBlockReorderMultiBlocks.java      |   69 +-
 .../hadoop/hbase/http/TestInfoServersACL.java      |  177 +-
 .../hbase/io/TestByteBufferOutputStream.java       |    8 +-
 .../hbase/io/TestFSDataInputStreamWrapper.java     |   34 +-
 .../org/apache/hadoop/hbase/io/TestFileLink.java   |   69 +-
 .../org/apache/hadoop/hbase/io/TestHFileLink.java  |   68 +-
 .../hadoop/hbase/io/TestHalfStoreFileReader.java   |   23 +-
 .../org/apache/hadoop/hbase/io/TestHeapSize.java   |  107 +-
 .../hbase/io/TestImmutableBytesWritable.java       |   78 +-
 .../org/apache/hadoop/hbase/io/TestMetricsIO.java  |    8 +-
 .../hadoop/hbase/io/compress/HFileTestBase.java    |   19 +-
 .../io/encoding/TestBufferedDataBlockEncoder.java  |   38 +-
 .../hbase/io/encoding/TestChangingEncoding.java    |   34 +-
 .../hbase/io/encoding/TestDataBlockEncoders.java   |  132 +-
 .../hbase/io/encoding/TestDataBlockEncoding.java   |    4 +-
 .../hbase/io/encoding/TestEncodedSeekers.java      |   41 +-
 .../io/encoding/TestLoadAndSwitchEncodeOnDisk.java |   17 +-
 .../io/encoding/TestSeekBeforeWithReverseScan.java |   10 +-
 .../io/encoding/TestSeekToBlockWithEncoders.java   |  137 +-
 .../hadoop/hbase/io/hfile/CacheTestUtils.java      |   61 +-
 .../apache/hadoop/hbase/io/hfile/KVGenerator.java  |   51 +-
 .../apache/hadoop/hbase/io/hfile/KeySampler.java   |   35 +-
 .../apache/hadoop/hbase/io/hfile/NanoTimer.java    |   88 +-
 .../hadoop/hbase/io/hfile/RandomKeyValueUtil.java  |   43 +-
 .../org/apache/hadoop/hbase/io/hfile/TagUsage.java |   11 +-
 .../hbase/io/hfile/TestBlockCacheReporting.java    |   33 +-
 .../hadoop/hbase/io/hfile/TestBlockIOUtils.java    |   13 +-
 .../hadoop/hbase/io/hfile/TestCacheConfig.java     |   36 +-
 .../hadoop/hbase/io/hfile/TestCacheOnWrite.java    |  188 +-
 .../hbase/io/hfile/TestCachedBlockQueue.java       |   23 +-
 .../apache/hadoop/hbase/io/hfile/TestChecksum.java |  185 +-
 .../hbase/io/hfile/TestCombinedBlockCache.java     |   16 +-
 .../hbase/io/hfile/TestFixedFileTrailer.java       |  125 +-
 .../io/hfile/TestForceCacheImportantBlocks.java    |   39 +-
 .../apache/hadoop/hbase/io/hfile/TestHFile.java    |  275 +-
 .../hadoop/hbase/io/hfile/TestHFileBlock.java      |  351 +--
 .../hadoop/hbase/io/hfile/TestHFileBlockIndex.java |  284 +-
 .../hbase/io/hfile/TestHFileDataBlockEncoder.java  |   89 +-
 .../hadoop/hbase/io/hfile/TestHFileEncryption.java |   87 +-
 .../TestHFileInlineToRootChunkConversion.java      |   29 +-
 .../hbase/io/hfile/TestHFilePrettyPrinter.java     |   29 +-
 .../hadoop/hbase/io/hfile/TestHFileReaderImpl.java |   25 +-
 .../hfile/TestHFileScannerImplReferenceCount.java  |   57 +-
 .../hadoop/hbase/io/hfile/TestHFileSeek.java       |  261 +-
 .../hadoop/hbase/io/hfile/TestHFileWriterV3.java   |  122 +-
 .../hfile/TestHFileWriterV3WithDataEncoders.java   |  119 +-
 .../io/hfile/TestLazyDataBlockDecompression.java   |  101 +-
 .../hbase/io/hfile/TestLruAdaptiveBlockCache.java  |  447 ++--
 .../hadoop/hbase/io/hfile/TestLruBlockCache.java   |  274 +-
 .../hadoop/hbase/io/hfile/TestLruCachedBlock.java  |    6 +-
 .../apache/hadoop/hbase/io/hfile/TestPrefetch.java |   53 +-
 .../apache/hadoop/hbase/io/hfile/TestReseekTo.java |   35 +-
 .../hbase/io/hfile/TestRowIndexV1DataEncoder.java  |    5 +-
 .../hbase/io/hfile/TestScannerFromBucketCache.java |   24 +-
 .../hfile/TestScannerSelectionUsingKeyRange.java   |   20 +-
 .../io/hfile/TestScannerSelectionUsingTTL.java     |   27 +-
 .../io/hfile/TestSeekBeforeWithInlineBlocks.java   |   61 +-
 .../apache/hadoop/hbase/io/hfile/TestSeekTo.java   |   63 +-
 .../hbase/io/hfile/TestTinyLfuBlockCache.java      |   90 +-
 .../hbase/io/hfile/bucket/TestBucketCache.java     |  137 +-
 .../io/hfile/bucket/TestBucketCacheRefCnt.java     |   59 +-
 .../io/hfile/bucket/TestBucketWriterThread.java    |   57 +-
 .../io/hfile/bucket/TestByteBufferIOEngine.java    |    7 +-
 .../bucket/TestExclusiveMemoryMmapEngine.java      |    4 +-
 .../hbase/io/hfile/bucket/TestFileIOEngine.java    |   13 +-
 .../hadoop/hbase/io/hfile/bucket/TestRAMCache.java |   19 +-
 .../io/hfile/bucket/TestVerifyBucketCacheFile.java |   65 +-
 .../apache/hadoop/hbase/ipc/AbstractTestIPC.java   |  186 +-
 .../hadoop/hbase/ipc/DelegatingRpcScheduler.java   |    4 +-
 .../hbase/ipc/MetricsHBaseServerWrapperStub.java   |    5 +-
 .../apache/hadoop/hbase/ipc/TestBlockingIPC.java   |   23 +-
 .../apache/hadoop/hbase/ipc/TestBufferChain.java   |   31 +-
 .../apache/hadoop/hbase/ipc/TestCallRunner.java    |   55 +-
 .../hadoop/hbase/ipc/TestFifoRpcScheduler.java     |   30 +-
 .../apache/hadoop/hbase/ipc/TestHBaseClient.java   |   21 +-
 .../hbase/ipc/TestMasterFifoRpcScheduler.java      |   10 +-
 .../org/apache/hadoop/hbase/ipc/TestNettyIPC.java  |   14 +-
 .../hadoop/hbase/ipc/TestNettyRpcServer.java       |   15 +-
 .../hadoop/hbase/ipc/TestPluggableQueueImpl.java   |   90 +-
 .../apache/hadoop/hbase/ipc/TestProtoBufRpc.java   |   15 +-
 .../hbase/ipc/TestProtobufRpcServiceImpl.java      |   30 +-
 .../hadoop/hbase/ipc/TestRWQueueRpcExecutor.java   |   11 +-
 .../hadoop/hbase/ipc/TestRpcClientLeaks.java       |    6 +-
 .../hadoop/hbase/ipc/TestRpcHandlerException.java  |   10 +-
 .../apache/hadoop/hbase/ipc/TestRpcMetrics.java    |   49 +-
 .../ipc/TestRpcServerSlowConnectionSetup.java      |   12 +-
 .../hbase/ipc/TestRpcServerTraceLogging.java       |   13 +-
 .../hadoop/hbase/ipc/TestSimpleRpcScheduler.java   |  154 +-
 .../hbase/mapreduce/MapreduceTestingShim.java      |   48 +-
 .../hadoop/hbase/master/AbstractTestDLS.java       |   28 +-
 .../hbase/master/AbstractTestRestartCluster.java   |    2 +-
 .../hadoop/hbase/master/AlwaysStandByHMaster.java  |   19 +-
 .../hadoop/hbase/master/DummyRegionProcedure.java  |    8 +-
 .../hbase/master/DummyRegionProcedureState.java    |    2 +-
 .../hadoop/hbase/master/DummyRegionServerList.java |    2 +-
 .../hbase/master/MockNoopMasterServices.java       |   91 +-
 .../hadoop/hbase/master/MockRegionServer.java      |  182 +-
 .../hbase/master/TestActiveMasterManager.java      |   84 +-
 .../hbase/master/TestAlwaysStandByHMaster.java     |   18 +-
 .../hbase/master/TestAssignmentManagerMetrics.java |   25 +-
 .../apache/hadoop/hbase/master/TestBalancer.java   |    7 +-
 .../hbase/master/TestClientMetaServiceRPCs.java    |   58 +-
 .../hbase/master/TestClockSkewDetection.java       |   19 +-
 .../hbase/master/TestCloseAnOpeningRegion.java     |    2 +-
 .../hadoop/hbase/master/TestClusterRestart.java    |    2 +-
 .../hbase/master/TestClusterRestartFailover.java   |   47 +-
 .../TestClusterRestartFailoverSplitWithoutZk.java  |    2 +-
 .../master/TestClusterRestartSplitWithoutZk.java   |    2 +-
 .../hbase/master/TestClusterStatusPublisher.java   |    7 +-
 .../hadoop/hbase/master/TestDLSAsyncFSWAL.java     |    4 +-
 .../apache/hadoop/hbase/master/TestDLSFSHLog.java  |    4 +-
 .../apache/hadoop/hbase/master/TestDeadServer.java |   27 +-
 .../hadoop/hbase/master/TestGetInfoPort.java       |    6 +-
 .../hbase/master/TestGetLastFlushedSequenceId.java |   22 +-
 .../hbase/master/TestGetReplicationLoad.java       |   92 +-
 .../hbase/master/TestHMasterCommandLine.java       |    9 +-
 .../hbase/master/TestHMasterRPCException.java      |   12 +-
 .../hbase/master/TestLoadProcedureError.java       |    6 +-
 .../org/apache/hadoop/hbase/master/TestMaster.java |   65 +-
 .../master/TestMasterAbortAndRSGotKilled.java      |    8 +-
 .../hbase/master/TestMasterBalanceThrottling.java  |   15 +-
 .../hadoop/hbase/master/TestMasterBalancerNPE.java |   40 +-
 .../hbase/master/TestMasterChoreScheduled.java     |   21 +-
 .../master/TestMasterCoprocessorServices.java      |  106 +-
 .../hbase/master/TestMasterDryRunBalancer.java     |   14 +-
 .../hadoop/hbase/master/TestMasterFailover.java    |   38 +-
 .../TestMasterFailoverBalancerPersistence.java     |   29 +-
 .../hadoop/hbase/master/TestMasterFileSystem.java  |   14 +-
 .../TestMasterFileSystemWithStoreFileTracking.java |   11 +-
 .../master/TestMasterFileSystemWithWALDir.java     |    6 +-
 .../TestMasterHandlerFullWhenTransitRegion.java    |   18 +-
 .../hadoop/hbase/master/TestMasterMetrics.java     |   39 +-
 .../hbase/master/TestMasterMetricsWrapper.java     |   39 +-
 .../hadoop/hbase/master/TestMasterNoCluster.java   |   95 +-
 .../hbase/master/TestMasterNotCarryTable.java      |    8 +-
 .../TestMasterOperationsForRegionReplicas.java     |   27 +-
 .../hadoop/hbase/master/TestMasterQosFunction.java |   40 +-
 .../TestMasterRestartAfterDisablingTable.java      |   35 +-
 .../hadoop/hbase/master/TestMasterShutdown.java    |   40 +-
 .../hadoop/hbase/master/TestMasterTransitions.java |  593 ++---
 .../master/TestMergeTableRegionsWhileRSCrash.java  |   29 +-
 .../master/TestMetaAssignmentWithStopMaster.java   |   23 +-
 .../hbase/master/TestMetaShutdownHandler.java      |   49 +-
 .../master/TestMigrateAndMirrorMetaLocations.java  |    2 +-
 .../master/TestMirroringTableStateManager.java     |   34 +-
 .../master/TestNewStartedRegionServerVersion.java  |    2 +-
 .../hadoop/hbase/master/TestRecreateCluster.java   |   42 +-
 .../hadoop/hbase/master/TestRegionPlacement.java   |  233 +-
 .../hadoop/hbase/master/TestRegionPlacement2.java  |   65 +-
 .../apache/hadoop/hbase/master/TestRegionPlan.java |    8 +-
 .../hbase/master/TestRegionPlansWithThrottle.java  |    7 +-
 .../hadoop/hbase/master/TestRegionState.java       |    8 +-
 .../hbase/master/TestRegionsRecoveryChore.java     |   62 +-
 .../master/TestRegionsRecoveryConfigManager.java   |    1 -
 .../master/TestRestartWithEmptyWALDirectory.java   |    4 +-
 .../master/TestRetainAssignmentOnRestart.java      |    8 +-
 ...estRetainAssignmentOnRestartSplitWithoutZk.java |    5 +-
 .../hadoop/hbase/master/TestRollingRestart.java    |   64 +-
 .../master/TestRoundRobinAssignmentOnRestart.java  |   15 +-
 ...oundRobinAssignmentOnRestartSplitWithoutZk.java |    6 +-
 .../TestServerCrashProcedureCarryingMetaStuck.java |    2 +-
 .../master/TestServerCrashProcedureStuck.java      |    2 +-
 .../hbase/master/TestShutdownBackupMaster.java     |   10 +-
 .../master/TestShutdownWithNoRegionServer.java     |    2 +-
 .../hadoop/hbase/master/TestSplitLogManager.java   |   91 +-
 .../hbase/master/TestSplitRegionWhileRSCrash.java  |    5 +-
 .../hadoop/hbase/master/TestSplitWALManager.java   |   69 +-
 .../hadoop/hbase/master/TestTableStateManager.java |   11 +-
 .../hadoop/hbase/master/TestWarmupRegion.java      |   58 +-
 .../master/assignment/AssignmentTestingUtil.java   |   37 +-
 .../master/assignment/MockMasterServices.java      |   69 +-
 .../assignment/TestAMAssignWithRandExec.java       |    2 +-
 .../master/assignment/TestAMServerFailedOpen.java  |    6 +-
 ...estAssignRegionToUninitializedRegionServer.java |    2 +-
 .../master/assignment/TestAssignmentManager.java   |   15 +-
 .../assignment/TestAssignmentManagerBase.java      |   50 +-
 .../TestAssignmentManagerLoadMetaRegionState.java  |    2 +-
 .../assignment/TestAssignmentManagerUtil.java      |    2 +-
 .../master/assignment/TestAssignmentOnRSCrash.java |   20 +-
 .../assignment/TestCloseRegionWhileRSCrash.java    |    6 +-
 .../TestDeadServerMetricRegionChore.java           |    1 +
 .../assignment/TestExceptionInAssignRegion.java    |    9 +-
 .../TestExceptionInUnassignedRegion.java           |    2 +-
 .../hbase/master/assignment/TestHbckChore.java     |   22 +-
 .../TestMasterAbortWhileMergingTable.java          |   44 +-
 .../assignment/TestMergeTableRegionsProcedure.java |   44 +-
 .../assignment/TestModifyTableWhileMerging.java    |   34 +-
 .../assignment/TestOpenRegionProcedureBackoff.java |    2 +-
 .../assignment/TestOpenRegionProcedureHang.java    |   20 +-
 .../assignment/TestRaceBetweenSCPAndDTP.java       |   12 +-
 .../assignment/TestRaceBetweenSCPAndTRSP.java      |    2 +-
 .../TestRegionAssignedToMultipleRegionServers.java |    8 +-
 .../hbase/master/assignment/TestRegionBypass.java  |   71 +-
 .../assignment/TestRegionMoveAndAbandon.java       |    5 +-
 .../master/assignment/TestRegionReplicaSplit.java  |   14 +-
 .../hbase/master/assignment/TestRegionSplit.java   |   29 +-
 .../TestRegionSplitAndSeparateChildren.java        |   29 +-
 .../master/assignment/TestRegionStateStore.java    |   24 +-
 .../hbase/master/assignment/TestRegionStates.java  |   41 +-
 .../assignment/TestReportOnlineRegionsRace.java    |    6 +-
 ...tReportRegionStateTransitionFromDeadServer.java |   14 +-
 .../TestReportRegionStateTransitionRetry.java      |    4 +-
 .../master/assignment/TestRogueRSAssignment.java   |   28 +-
 .../master/assignment/TestSCPGetRegionsRace.java   |   12 +-
 .../assignment/TestSplitTableRegionProcedure.java  |  100 +-
 .../TestTransitRegionStateProcedure.java           |    2 +-
 .../assignment/TestWakeUpUnexpectedProcedure.java  |   16 +-
 .../hbase/master/balancer/BalancerTestBase.java    |  274 +-
 .../hbase/master/balancer/BalancerTestBase2.java   |    2 +-
 .../hbase/master/balancer/DummyCostFunction.java   |    2 +-
 .../balancer/DummyMetricsStochasticBalancer.java   |   21 +-
 .../LoadBalancerPerformanceEvaluation.java         |   32 +-
 .../LoadOnlyFavoredStochasticBalancer.java         |    2 +-
 .../master/balancer/TestBalancerDecision.java      |   16 +-
 .../master/balancer/TestBalancerRejection.java     |   50 +-
 .../TestBalancerStatusTagInJMXMetrics.java         |   12 +-
 .../master/balancer/TestBaseLoadBalancer.java      |  147 +-
 .../hbase/master/balancer/TestDoubleArrayCost.java |    2 +-
 .../balancer/TestFavoredNodeTableImport.java       |    6 +-
 .../TestFavoredStochasticBalancerPickers.java      |   60 +-
 .../TestFavoredStochasticLoadBalancer.java         |   84 +-
 .../master/balancer/TestRegionLocationFinder.java  |   31 +-
 .../balancer/TestRegionsOnMasterOptions.java       |  111 +-
 .../hbase/master/balancer/TestServerAndLoad.java   |    8 +-
 .../master/balancer/TestSimpleLoadBalancer.java    |  124 +-
 .../balancer/TestStochasticBalancerJmxMetrics.java |   10 +-
 .../balancer/TestStochasticLoadBalancer.java       |  180 +-
 .../TestStochasticLoadBalancerBalanceCluster.java  |    8 +-
 ...estStochasticLoadBalancerHeterogeneousCost.java |   73 +-
 ...ochasticLoadBalancerHeterogeneousCostRules.java |   38 +-
 .../TestStochasticLoadBalancerLargeCluster.java    |    4 +-
 .../TestStochasticLoadBalancerMidCluster.java      |    4 +-
 .../TestStochasticLoadBalancerRegionReplica.java   |   12 +-
 ...asticLoadBalancerRegionReplicaLargeCluster.java |    2 +-
 ...chasticLoadBalancerRegionReplicaMidCluster.java |    2 +-
 ...egionReplicaReplicationGreaterThanNumNodes.java |    6 +-
 ...ochasticLoadBalancerRegionReplicaSameHosts.java |    4 +-
 ...ochasticLoadBalancerRegionReplicaWithRacks.java |    6 +-
 .../TestStochasticLoadBalancerSmallCluster.java    |    4 +-
 .../hbase/master/cleaner/TestCleanerChore.java     |    4 +-
 .../hbase/master/cleaner/TestHFileCleaner.java     |   60 +-
 .../hbase/master/cleaner/TestHFileLinkCleaner.java |   12 +-
 .../hbase/master/cleaner/TestLogsCleaner.java      |   82 +-
 .../cleaner/TestReplicationBarrierCleaner.java     |    6 +-
 .../cleaner/TestReplicationHFileCleaner.java       |   29 +-
 .../master/cleaner/TestSnapshotCleanerChore.java   |   44 +-
 .../master/cleaner/TestSnapshotFromMaster.java     |   93 +-
 .../http/TestApiV1ClusterMetricsResource.java      |  111 +-
 .../hbase/master/http/TestMasterStatusServlet.java |   52 +-
 .../hadoop/hbase/master/http/TestMetaBrowser.java  |  161 +-
 .../master/http/TestMetaBrowserNoCluster.java      |   71 +-
 .../hbase/master/http/TestRegionVisualizer.java    |    4 +-
 .../hbase/master/http/gson/GsonFactoryTest.java    |   16 +-
 .../hbase/master/janitor/TestCatalogJanitor.java   |  224 +-
 .../master/janitor/TestCatalogJanitorCluster.java  |   14 +-
 .../janitor/TestCatalogJanitorInMemoryStates.java  |   14 +-
 .../hadoop/hbase/master/janitor/TestMetaFixer.java |  101 +-
 .../hbase/master/locking/TestLockManager.java      |   32 +-
 .../hbase/master/locking/TestLockProcedure.java    |   83 +-
 .../migrate/TestInitializeStoreFileTracker.java    |    7 +-
 ...gionNormalizerManagerConfigurationObserver.java |   16 +-
 .../normalizer/TestRegionNormalizerWorkQueue.java  |   32 +-
 .../normalizer/TestRegionNormalizerWorker.java     |  100 +-
 .../normalizer/TestSimpleRegionNormalizer.java     |  323 +--
 .../TestSimpleRegionNormalizerOnCluster.java       |  183 +-
 .../MasterFailoverWithProceduresTestBase.java      |    2 +-
 ...terProcedureSchedulerPerformanceEvaluation.java |   63 +-
 .../procedure/MasterProcedureTestingUtility.java   |  188 +-
 .../procedure/TestCloneSnapshotProcedure.java      |   37 +-
 .../TestCloneSnapshotProcedureFileBasedSFT.java    |    7 +-
 .../procedure/TestCreateNamespaceProcedure.java    |   53 +-
 .../procedure/TestCreateTableNoRegionServer.java   |   37 +-
 .../master/procedure/TestCreateTableProcedure.java |   61 +-
 .../TestCreateTableProcedureMuitipleRegions.java   |    2 +-
 .../TestCreateTableWithMasterFailover.java         |    2 +-
 .../TestDeleteColumnFamilyProcedureFromClient.java |   16 +-
 .../procedure/TestDeleteNamespaceProcedure.java    |   42 +-
 .../master/procedure/TestDeleteTableProcedure.java |   51 +-
 .../TestDeleteTableWithMasterFailover.java         |    2 +-
 .../procedure/TestDisableTableProcedure.java       |   38 +-
 .../TestDisableTableWithMasterFailover.java        |    2 +-
 .../master/procedure/TestEnableTableProcedure.java |    3 +-
 .../TestEnableTableWithMasterFailover.java         |    2 +-
 .../TestFastFailOnProcedureNotRegistered.java      |   10 +-
 .../hadoop/hbase/master/procedure/TestHBCKSCP.java |   25 +-
 .../hbase/master/procedure/TestHBCKSCPUnknown.java |   15 +-
 .../master/procedure/TestIgnoreUnknownFamily.java  |   39 +-
 .../procedure/TestMasterObserverPostCalls.java     |  110 +-
 .../procedure/TestMasterProcedureEvents.java       |   20 +-
 .../procedure/TestMasterProcedureScheduler.java    |   24 +-
 .../TestMasterProcedureSchedulerConcurrency.java   |   40 +-
 .../procedure/TestModifyNamespaceProcedure.java    |   57 +-
 .../master/procedure/TestModifyTableProcedure.java |  118 +-
 .../hbase/master/procedure/TestProcedureAdmin.java |   47 +-
 .../master/procedure/TestProcedurePriority.java    |    6 +-
 .../TestReopenTableRegionsProcedureBackoff.java    |    2 +-
 ...estReopenTableRegionsProcedureInfiniteLoop.java |    2 +-
 .../procedure/TestRestoreSnapshotProcedure.java    |   31 +-
 .../hadoop/hbase/master/procedure/TestSCP.java     |    2 +-
 .../hadoop/hbase/master/procedure/TestSCPBase.java |    7 +-
 .../hbase/master/procedure/TestSCPWithMeta.java    |    2 +-
 .../procedure/TestSCPWithMetaWithReplicas.java     |    2 +-
 ...CPWithMetaWithReplicasWithoutZKCoordinated.java |    2 +-
 .../TestSCPWithMetaWithoutZKCoordinated.java       |    2 +-
 .../master/procedure/TestSCPWithReplicas.java      |   25 +-
 .../TestSCPWithReplicasWithoutZKCoordinated.java   |    4 +-
 .../hbase/master/procedure/TestSCPWithoutMeta.java |    2 +-
 .../procedure/TestSCPWithoutMetaWithReplicas.java  |    2 +-
 ...ithoutMetaWithReplicasWithoutZKCoordinated.java |    4 +-
 .../TestSCPWithoutMetaWithoutZKCoordinated.java    |    2 +-
 .../procedure/TestSCPWithoutZKCoordinated.java     |    6 +-
 .../procedure/TestSafemodeBringsDownMaster.java    |   22 +-
 .../procedure/TestSchedulerQueueDeadLock.java      |   14 +-
 .../procedure/TestServerRemoteProcedure.java       |   37 +-
 .../master/procedure/TestSnapshotProcedure.java    |   20 +-
 .../TestSnapshotProcedureBasicSnapshot.java        |    3 +-
 .../TestSnapshotProcedureConcurrently.java         |   35 +-
 .../TestSnapshotProcedureMasterRestarts.java       |   19 +-
 .../master/procedure/TestSnapshotProcedureRIT.java |   15 +-
 .../procedure/TestSnapshotProcedureRSCrashes.java  |   15 +-
 .../TestSnapshotProcedureSnapshotCorrupted.java    |   28 +-
 .../procedure/TestSnapshotRegionProcedure.java     |    5 +-
 .../procedure/TestSnapshotVerifyProcedure.java     |   32 +-
 .../master/procedure/TestSplitWALProcedure.java    |   21 +-
 .../procedure/TestTableDDLProcedureBase.java       |    9 +-
 .../TestTableDescriptorModificationFromClient.java |   30 +-
 .../procedure/TestTruncateTableProcedure.java      |   82 +-
 .../TestTruncateTableWithMasterFailover.java       |    2 +-
 .../procedure/TestWALProcedureStoreOnHDFS.java     |   41 +-
 .../hbase/master/region/MasterRegionTestBase.java  |    2 +-
 .../region/TestChangeSFTForMasterRegion.java       |    2 +-
 .../master/region/TestMasterRegionCompaction.java  |    6 +-
 .../hbase/master/region/TestMasterRegionFlush.java |    2 +-
 .../master/region/TestMasterRegionInitialize.java  |    2 +-
 .../region/TestMasterRegionOnTwoFileSystems.java   |    6 +-
 .../master/region/TestMasterRegionWALCleaner.java  |   10 +-
 .../master/region/TestMasterRegionWALRecovery.java |    3 +-
 .../TestModifyPeerProcedureRetryBackoff.java       |   12 +-
 .../master/snapshot/TestSnapshotFileCache.java     |   56 +-
 ...stSnapshotFileCacheWithDifferentWorkingDir.java |   11 +-
 .../master/snapshot/TestSnapshotHFileCleaner.java  |   53 +-
 .../hbase/master/snapshot/TestSnapshotManager.java |   36 +-
 .../master/snapshot/TestTakeSnapshotHandler.java   |   26 +-
 .../org/apache/hadoop/hbase/mob/MobTestUtil.java   |   33 +-
 .../apache/hadoop/hbase/mob/TestCachedMobFile.java |   20 +-
 .../hbase/mob/TestDefaultMobStoreFlusher.java      |  112 +-
 .../hbase/mob/TestExpiredMobFileCleaner.java       |   24 +-
 .../hadoop/hbase/mob/TestMobDataBlockEncoding.java |   18 +-
 .../org/apache/hadoop/hbase/mob/TestMobFile.java   |   22 +-
 .../apache/hadoop/hbase/mob/TestMobFileCache.java  |   33 +-
 .../apache/hadoop/hbase/mob/TestMobFileLink.java   |   13 +-
 .../apache/hadoop/hbase/mob/TestMobFileName.java   |   13 +-
 .../hbase/mob/TestMobWithByteBuffAllocator.java    |    5 +-
 .../hbase/mob/compactions/TestMobCompactor.java    |  218 +-
 .../TestPartitionedMobCompactionRequest.java       |    4 +-
 .../compactions/TestPartitionedMobCompactor.java   |  365 +--
 .../TestMemoryBoundedLogMessageBuffer.java         |   30 +-
 .../hadoop/hbase/monitoring/TestTaskMonitor.java   |   39 +-
 .../hbase/namequeues/TestNamedQueueRecorder.java   |  452 ++--
 .../hbase/namequeues/TestSlowLogAccessor.java      |   26 +-
 .../hbase/namespace/TestNamespaceAuditor.java      |  164 +-
 .../procedure/SimpleMasterProcedureManager.java    |   22 +-
 .../hbase/procedure/SimpleRSProcedureManager.java  |   32 +-
 .../hbase/procedure/TestFailedProcCleanup.java     |   28 +-
 .../hadoop/hbase/procedure/TestProcedure.java      |   29 +-
 .../hbase/procedure/TestProcedureCoordinator.java  |   89 +-
 .../hbase/procedure/TestProcedureDescriber.java    |   25 +-
 .../hbase/procedure/TestProcedureManager.java      |   12 +-
 .../hbase/procedure/TestProcedureMember.java       |  157 +-
 .../hadoop/hbase/procedure/TestZKProcedure.java    |  145 +-
 .../procedure/TestZKProcedureControllers.java      |  128 +-
 .../RegionProcedureStorePerformanceEvaluation.java |    7 +-
 .../store/region/RegionProcedureStoreTestBase.java |    2 +-
 .../region/RegionProcedureStoreTestHelper.java     |    2 +-
 .../region/RegionProcedureStoreTestProcedure.java  |    4 +-
 .../region/TestHFileProcedurePrettyPrinter.java    |    5 +-
 .../store/region/TestRegionProcedureStore.java     |    3 +-
 .../region/TestRegionProcedureStoreMigration.java  |    2 +-
 .../region/TestWALProcedurePrettyPrinter.java      |    2 +-
 .../hadoop/hbase/protobuf/TestProtobufUtil.java    |   94 +-
 .../hbase/protobuf/TestReplicationProtobuf.java    |   12 +-
 .../hbase/quotas/SpaceQuotaHelperForTests.java     |  194 +-
 .../quotas/SpaceQuotaSnapshotNotifierForTest.java  |   27 +-
 .../hbase/quotas/TestActivePolicyEnforcement.java  |   58 +-
 .../quotas/TestClusterScopeQuotaThrottle.java      |   12 +-
 .../hbase/quotas/TestFileArchiverNotifierImpl.java |   53 +-
 .../quotas/TestFileSystemUtilizationChore.java     |   64 +-
 .../hbase/quotas/TestGlobalQuotaSettingsImpl.java  |   62 +-
 .../hbase/quotas/TestLowLatencySpaceQuotas.java    |   86 +-
 .../hbase/quotas/TestMasterQuotaManager.java       |    4 +-
 .../hbase/quotas/TestMasterQuotasObserver.java     |   35 +-
 .../quotas/TestMasterQuotasObserverWithMocks.java  |   19 +-
 .../quotas/TestNamespaceQuotaViolationStore.java   |   74 +-
 .../apache/hadoop/hbase/quotas/TestQuotaAdmin.java |  168 +-
 .../hbase/quotas/TestQuotaObserverChore.java       |   24 +-
 .../TestQuotaObserverChoreRegionReports.java       |   25 +-
 .../TestQuotaObserverChoreWithMiniCluster.java     |   98 +-
 .../apache/hadoop/hbase/quotas/TestQuotaState.java |   17 +-
 .../hadoop/hbase/quotas/TestQuotaStatusRPCs.java   |   40 +-
 .../hadoop/hbase/quotas/TestQuotaTableUtil.java    |  106 +-
 .../hadoop/hbase/quotas/TestQuotaThrottle.java     |   15 +-
 .../hadoop/hbase/quotas/TestRateLimiter.java       |   22 +-
 .../quotas/TestRegionServerSpaceQuotaManager.java  |   54 +-
 .../hadoop/hbase/quotas/TestRegionSizeImpl.java    |   19 +-
 .../hbase/quotas/TestRegionSizeReportingChore.java |   39 +-
 .../hbase/quotas/TestRegionSizeStoreImpl.java      |   28 +-
 .../hadoop/hbase/quotas/TestRegionSizeUse.java     |   19 +-
 .../quotas/TestSnapshotQuotaObserverChore.java     |  136 +-
 .../quotas/TestSpaceQuotaBasicFunctioning.java     |   40 +-
 .../hbase/quotas/TestSpaceQuotaDropTable.java      |   13 +-
 .../hbase/quotas/TestSpaceQuotaIncrease.java       |   11 +-
 .../hbase/quotas/TestSpaceQuotaOnBulkLoad.java     |   28 +-
 .../quotas/TestSpaceQuotaOnNonExistingTables.java  |    9 +-
 .../hadoop/hbase/quotas/TestSpaceQuotaRemoval.java |   27 +-
 .../hbase/quotas/TestSpaceQuotaSwitchPolicies.java |   24 +-
 ...estSpaceQuotaViolationPolicyRefresherChore.java |  102 +-
 .../hadoop/hbase/quotas/TestSpaceQuotas.java       |  107 +-
 .../quotas/TestSpaceQuotasWithRegionReplicas.java  |   18 +-
 .../hbase/quotas/TestSpaceQuotasWithSnapshots.java |   84 +-
 .../quotas/TestSuperUserQuotaPermissions.java      |   32 +-
 .../hbase/quotas/TestTableQuotaViolationStore.java |   87 +-
 .../TestTableSpaceQuotaViolationNotifier.java      |   22 +-
 .../hadoop/hbase/quotas/TestTablesWithQuotas.java  |   31 +-
 .../hadoop/hbase/quotas/ThrottleQuotaTestUtil.java |   24 +-
 .../policies/BaseViolationPolicyEnforcement.java   |   15 +-
 ...BulkLoadCheckingViolationPolicyEnforcement.java |   16 +-
 ...TestDisableTableViolationPolicyEnforcement.java |    4 +-
 .../TestNoInsertsViolationPolicyEnforcement.java   |    4 +-
 ...ritesCompactionsViolationPolicyEnforcement.java |    6 +-
 .../TestNoWritesViolationPolicyEnforcement.java    |    4 +-
 .../AbstractTestDateTieredCompactionPolicy.java    |   18 +-
 .../hbase/regionserver/CreateRandomStoreFile.java  |  106 +-
 .../hbase/regionserver/DataBlockEncodingTool.java  |  334 ++-
 .../regionserver/DelegatingInternalScanner.java    |    3 +-
 .../regionserver/DelegatingKeyValueScanner.java    |    4 +-
 .../regionserver/EncodedSeekPerformanceTest.java   |   65 +-
 .../hbase/regionserver/KeyValueScanFixture.java    |   14 +-
 .../MetricsRegionServerWrapperStub.java            |    9 +-
 .../regionserver/MetricsRegionWrapperStub.java     |    1 -
 .../hadoop/hbase/regionserver/MockHStoreFile.java  |   41 +-
 .../hbase/regionserver/NoOpScanPolicyObserver.java |   10 +-
 .../hbase/regionserver/OOMERegionServer.java       |   18 +-
 .../hadoop/hbase/regionserver/RegionAsTable.java   |   94 +-
 .../hbase/regionserver/StatefulStoreMockMaker.java |   12 +-
 .../hbase/regionserver/TestAtomicOperation.java    |  147 +-
 .../hadoop/hbase/regionserver/TestBlocksRead.java  |   88 +-
 .../hbase/regionserver/TestBlocksScanned.java      |   54 +-
 .../regionserver/TestBootstrapNodeManager.java     |    2 +-
 .../regionserver/TestBrokenStoreFileCleaner.java   |   71 +-
 .../hadoop/hbase/regionserver/TestBulkLoad.java    |  115 +-
 .../regionserver/TestBulkLoadReplication.java      |  118 +-
 .../TestBulkLoadReplicationHFileRefs.java          |   66 +-
 .../hbase/regionserver/TestBulkloadBase.java       |   28 +-
 .../regionserver/TestCacheOnWriteInSchema.java     |   67 +-
 .../hadoop/hbase/regionserver/TestCellFlatSet.java |  135 +-
 .../hbase/regionserver/TestCellSkipListSet.java    |   27 +-
 .../TestCleanupCompactedFileAfterFailover.java     |   17 +-
 .../TestCleanupCompactedFileOnRegionClose.java     |   50 +-
 .../hbase/regionserver/TestCleanupMetaWAL.java     |   14 +-
 .../regionserver/TestClearRegionBlockCache.java    |   30 +-
 .../hadoop/hbase/regionserver/TestClusterId.java   |   26 +-
 .../hbase/regionserver/TestColumnSeeking.java      |   26 +-
 .../hbase/regionserver/TestCompactSplitThread.java |   12 +-
 .../hbase/regionserver/TestCompactingMemStore.java |  250 +-
 .../TestCompactingToCellFlatMapMemStore.java       |  361 ++-
 .../hadoop/hbase/regionserver/TestCompaction.java  |  144 +-
 .../regionserver/TestCompactionAfterBulkLoad.java  |   27 +-
 .../TestCompactionArchiveConcurrentClose.java      |   20 +-
 .../TestCompactionArchiveIOException.java          |   17 +-
 .../regionserver/TestCompactionFileNotFound.java   |   13 +-
 .../TestCompactionInDeadRegionServer.java          |   12 +-
 .../TestCompactionLifeCycleTracker.java            |   62 +-
 .../hbase/regionserver/TestCompactionPolicy.java   |   25 +-
 .../hbase/regionserver/TestCompactionState.java    |   64 +-
 .../regionserver/TestCompactionWithByteBuff.java   |   15 +-
 .../TestCompactionWithCoprocessor.java             |   12 +-
 .../hbase/regionserver/TestCompactorMemLeak.java   |    9 +-
 .../regionserver/TestCompoundBloomFilter.java      |  165 +-
 .../regionserver/TestDataBlockEncodingTool.java    |   37 +-
 .../TestDateTieredCompactionPolicy.java            |   36 +-
 ...TieredCompactionPolicyHeterogeneousStorage.java |   58 +-
 .../TestDateTieredCompactionPolicyOverflow.java    |    7 +-
 .../regionserver/TestDefaultCompactSelection.java  |   66 +-
 .../hbase/regionserver/TestDefaultMemStore.java    |  342 ++-
 .../hbase/regionserver/TestDefaultStoreEngine.java |   14 +-
 .../hbase/regionserver/TestDeleteMobTable.java     |   25 +-
 .../regionserver/TestDirectStoreSplitsMerges.java  |  120 +-
 .../hbase/regionserver/TestEncryptionDisabled.java |   15 +-
 .../regionserver/TestEncryptionKeyRotation.java    |   45 +-
 .../regionserver/TestEncryptionRandomKeying.java   |   23 +-
 .../regionserver/TestEndToEndSplitTransaction.java |   37 +-
 .../hbase/regionserver/TestFSErrorsExposed.java    |   87 +-
 .../regionserver/TestFailedAppendAndSync.java      |   51 +-
 .../regionserver/TestFlushLifeCycleTracker.java    |   46 +-
 .../hbase/regionserver/TestFlushRegionEntry.java   |    7 +-
 .../regionserver/TestGetClosestAtOrBefore.java     |   82 +-
 .../hadoop/hbase/regionserver/TestHMobStore.java   |  200 +-
 .../hadoop/hbase/regionserver/TestHRegion.java     | 1449 +++++-----
 .../hbase/regionserver/TestHRegionFileSystem.java  |   25 +-
 .../hadoop/hbase/regionserver/TestHRegionInfo.java |  210 +-
 .../hbase/regionserver/TestHRegionOnCluster.java   |   18 +-
 .../regionserver/TestHRegionReplayEvents.java      |  330 ++-
 .../regionserver/TestHRegionServerBulkLoad.java    |  117 +-
 .../TestHRegionServerBulkLoadWithOldClient.java    |   43 +-
 .../hbase/regionserver/TestHRegionTracing.java     |    6 +-
 .../regionserver/TestHRegionWithInMemoryFlush.java |   46 +-
 .../hadoop/hbase/regionserver/TestHStore.java      |  679 ++---
 .../hadoop/hbase/regionserver/TestHStoreFile.java  |   60 +-
 .../regionserver/TestHdfsSnapshotHRegion.java      |   40 +-
 .../hbase/regionserver/TestHeapMemoryManager.java  |  121 +-
 .../TestInputStreamBlockDistribution.java          |   26 +-
 .../hbase/regionserver/TestIsDeleteFailure.java    |   27 +-
 .../hbase/regionserver/TestJoinedScanners.java     |   45 +-
 .../hadoop/hbase/regionserver/TestKeepDeletes.java |  283 +-
 .../hbase/regionserver/TestKeyValueHeap.java       |    6 +-
 .../regionserver/TestKeyValueScanFixture.java      |   17 +-
 .../hadoop/hbase/regionserver/TestLogRoller.java   |   15 +-
 .../hbase/regionserver/TestMajorCompaction.java    |    8 +-
 .../TestMaxResultsPerColumnFamily.java             |   20 +-
 .../hbase/regionserver/TestMemStoreChunkPool.java  |   43 +-
 .../hbase/regionserver/TestMemStoreFlusher.java    |   15 +-
 .../hadoop/hbase/regionserver/TestMemStoreLAB.java |   69 +-
 .../regionserver/TestMemStoreSegmentsIterator.java |    9 +-
 .../regionserver/TestMemstoreLABWithoutPool.java   |   27 +-
 .../regionserver/TestMergesSplitsAddToTracker.java |   91 +-
 .../regionserver/TestMetricsHeapMemoryManager.java |    8 +-
 .../hbase/regionserver/TestMetricsRegion.java      |   41 +-
 .../regionserver/TestMetricsRegionServer.java      |   28 +-
 .../regionserver/TestMetricsTableAggregate.java    |    3 +-
 .../regionserver/TestMetricsTableLatencies.java    |   83 +-
 .../regionserver/TestMetricsUserAggregate.java     |   82 +-
 .../hadoop/hbase/regionserver/TestMinVersions.java |  212 +-
 .../TestMiniBatchOperationInProgress.java          |   14 +-
 .../hbase/regionserver/TestMinorCompaction.java    |   38 +-
 .../hbase/regionserver/TestMobStoreCompaction.java |   42 +-
 .../hbase/regionserver/TestMobStoreScanner.java    |   88 +-
 .../hbase/regionserver/TestMultiColumnScanner.java |   90 +-
 ...tiColumnScannerWithAlgoGZAndNoDataEncoding.java |    5 +-
 ...iColumnScannerWithAlgoGZAndUseDataEncoding.java |    5 +-
 ...ultiColumnScannerWithNoneAndNoDataEncoding.java |    5 +-
 ...ltiColumnScannerWithNoneAndUseDataEncoding.java |    5 +-
 .../hbase/regionserver/TestMultiLogThreshold.java  |    9 +-
 .../TestMultiVersionConcurrencyControl.java        |   13 +-
 .../TestMultiVersionConcurrencyControlBasic.java   |    6 +-
 .../hbase/regionserver/TestMutateRowsRecovery.java |    4 +-
 .../TestNewVersionBehaviorFromClientSide.java      |    6 +-
 ...estNotCleanupCompactedFileWhenRegionWarmup.java |   21 +-
 .../TestObservedExceptionsInBatch.java             |    4 +-
 .../TestOpenRegionFailedMemoryLeak.java            |    8 +-
 .../TestOpenSeqNumUnexpectedIncrease.java          |    6 +-
 .../hadoop/hbase/regionserver/TestParallelPut.java |   45 +-
 .../regionserver/TestPerColumnFamilyFlush.java     |   66 +-
 .../hadoop/hbase/regionserver/TestPriorityRpc.java |   62 +-
 .../hadoop/hbase/regionserver/TestQosFunction.java |   14 +-
 .../hbase/regionserver/TestRSChoresScheduled.java  |   15 +-
 .../regionserver/TestRSKilledWhenInitializing.java |   36 +-
 .../hbase/regionserver/TestRSRpcServices.java      |   10 +-
 .../hbase/regionserver/TestRSSnapshotVerifier.java |   27 +-
 .../TestReadAndWriteRegionInfoFile.java            |    2 +-
 .../hbase/regionserver/TestRecoveredEdits.java     |   72 +-
 .../TestRecoveredEditsReplayAndAbort.java          |   91 +-
 .../hbase/regionserver/TestRegionFavoredNodes.java |   49 +-
 .../hbase/regionserver/TestRegionIncrement.java    |   82 +-
 .../TestRegionInfoStaticInitialization.java        |   13 +-
 .../hbase/regionserver/TestRegionInterrupt.java    |   30 +-
 .../TestRegionMergeTransactionOnCluster.java       |  147 +-
 .../hadoop/hbase/regionserver/TestRegionMove.java  |   20 +-
 .../hadoop/hbase/regionserver/TestRegionOpen.java  |   17 +-
 .../regionserver/TestRegionReplicaFailover.java    |   48 +-
 .../TestRegionReplicaWaitForPrimaryFlushConf.java  |   12 +-
 .../hbase/regionserver/TestRegionReplicas.java     |   67 +-
 .../TestRegionReplicasAreDistributed.java          |   20 +-
 .../TestRegionReplicasWithModifyTable.java         |    2 +-
 .../TestRegionReplicasWithRestartScenarios.java    |   30 +-
 .../hbase/regionserver/TestRegionServerAbort.java  |   42 +-
 .../regionserver/TestRegionServerAbortTimeout.java |    9 +-
 .../regionserver/TestRegionServerAccounting.java   |    8 +-
 .../TestRegionServerCrashDisableWAL.java           |    2 +-
 .../regionserver/TestRegionServerHostname.java     |   59 +-
 .../regionserver/TestRegionServerMetrics.java      |   88 +-
 .../regionserver/TestRegionServerNoMaster.java     |   63 +-
 .../TestRegionServerOnlineConfigChange.java        |   99 +-
 .../TestRegionServerReadRequestMetrics.java        |   60 +-
 .../TestRegionServerRegionSpaceUseReport.java      |   26 +-
 .../TestRegionServerReportForDuty.java             |   36 +-
 .../hbase/regionserver/TestRegionServerScan.java   |   14 +-
 .../hbase/regionserver/TestRegionSplitPolicy.java  |    2 +-
 .../regionserver/TestRegionSplitRestriction.java   |   45 +-
 .../regionserver/TestRemoveRegionMetrics.java      |   29 +-
 .../regionserver/TestRequestsPerSecondMetric.java  |   39 +-
 .../hbase/regionserver/TestResettingCounters.java  |   39 +-
 .../hbase/regionserver/TestReversibleScanners.java |  255 +-
 .../regionserver/TestRowPrefixBloomFilter.java     |   69 +-
 .../hadoop/hbase/regionserver/TestRowTooBig.java   |   49 +-
 .../regionserver/TestRpcSchedulerFactory.java      |   11 +-
 .../regionserver/TestSCVFWithMiniCluster.java      |   13 +-
 .../hbase/regionserver/TestScanWithBloomError.java |   64 +-
 .../hadoop/hbase/regionserver/TestScanner.java     |  183 +-
 .../regionserver/TestScannerHeartbeatMessages.java |   59 +-
 .../regionserver/TestScannerRPCScanMetrics.java    |   24 +-
 .../regionserver/TestScannerRetriableFailure.java  |   15 +-
 .../regionserver/TestScannerWithBulkload.java      |   73 +-
 .../regionserver/TestScannerWithCorruptHFile.java  |    8 +-
 .../regionserver/TestSecureBulkLoadManager.java    |   93 +-
 .../regionserver/TestSecureBulkloadListener.java   |   39 +-
 .../hbase/regionserver/TestSeekOptimizations.java  |  177 +-
 .../hbase/regionserver/TestServerNonceManager.java |   20 +-
 .../TestSettingTimeoutOnBlockingPoint.java         |   14 +-
 .../hbase/regionserver/TestShortCircuitGet.java    |   25 +-
 .../regionserver/TestShutdownWhileWALBroken.java   |    6 +-
 .../regionserver/TestSimpleTimeRangeTracker.java   |    8 +-
 .../hbase/regionserver/TestSplitLogWorker.java     |  114 +-
 .../TestSplitTransactionOnCluster.java             |  261 +-
 .../hbase/regionserver/TestSplitWalDataLoss.java   |   22 +-
 .../regionserver/TestSplitWithBlockingFiles.java   |    9 +-
 .../hbase/regionserver/TestStoreFileInfo.java      |   24 +-
 .../regionserver/TestStoreFileRefresherChore.java  |   50 +-
 .../TestStoreFileScannerWithTagCompression.java    |   20 +-
 .../hbase/regionserver/TestStoreScanner.java       |  436 ++-
 .../regionserver/TestStoreScannerClosure.java      |   49 +-
 .../hbase/regionserver/TestStripeStoreEngine.java  |   15 +-
 .../regionserver/TestStripeStoreFileManager.java   |  173 +-
 .../hbase/regionserver/TestSwitchToStreamRead.java |   18 +-
 .../regionserver/TestSyncTimeRangeTracker.java     |   24 +-
 .../apache/hadoop/hbase/regionserver/TestTags.java |   39 +-
 .../regionserver/TestTimestampFilterSeekHint.java  |   27 +-
 .../hadoop/hbase/regionserver/TestWALLockup.java   |   41 +-
 .../TestWALMonotonicallyIncreasingSeqId.java       |   27 +-
 .../TestWalAndCompactingMemStoreFlush.java         |  318 +--
 .../hadoop/hbase/regionserver/TestWideScanner.java |    2 +-
 .../compactions/ConstantSizeFileListGenerator.java |    3 +-
 .../regionserver/compactions/EverythingPolicy.java |    7 +-
 .../compactions/ExplicitFileListGenerator.java     |   36 +-
 .../compactions/GaussianFileListGenerator.java     |    5 +-
 .../compactions/MockStoreFileGenerator.java        |   16 +-
 .../compactions/PerfTestCompactionPolicies.java    |   82 +-
 .../SemiConstantSizeFileListGenerator.java         |    2 +-
 .../compactions/SinusoidalFileListGenerator.java   |    4 +-
 .../compactions/SpikyFileListGenerator.java        |    4 +-
 .../compactions/StoreFileListGenerator.java        |    4 +-
 .../regionserver/compactions/TestCloseChecker.java |    5 +-
 .../compactions/TestCompactedHFilesDischarger.java |   22 +-
 .../regionserver/compactions/TestCompactor.java    |    5 +-
 .../compactions/TestCurrentHourProvider.java       |    2 +-
 .../compactions/TestDateTieredCompactor.java       |   20 +-
 .../compactions/TestFIFOCompactionPolicy.java      |   70 +-
 .../regionserver/compactions/TestOffPeakHours.java |   12 +-
 .../compactions/TestStripeCompactionPolicy.java    |  259 +-
 .../compactions/TestStripeCompactor.java           |   20 +-
 .../regionserver/http/TestRSStatusServlet.java     |   19 +-
 .../querymatcher/AbstractTestScanQueryMatcher.java |    2 +-
 .../TestCompactionScanQueryMatcher.java            |   14 +-
 .../querymatcher/TestExplicitColumnTracker.java    |   12 +-
 .../TestNewVersionBehaviorTracker.java             |   48 +-
 .../querymatcher/TestScanDeleteTracker.java        |   48 +-
 .../TestScanWildcardColumnTracker.java             |   16 +-
 .../querymatcher/TestUserScanQueryMatcher.java     |   73 +-
 .../storefiletracker/StoreFileTrackerForTest.java  |    2 +-
 .../TestChangeStoreFileTracker.java                |    2 +-
 .../TestMigrationStoreFileTracker.java             |    8 +-
 .../TestRegionWithFileBasedStoreFileTracker.java   |    2 +-
 .../storefiletracker/TestStoreFileListFile.java    |    2 +-
 .../TestStoreFileTrackerFactory.java               |    2 +-
 .../TestStoreFileTrackerValidationUtils.java       |    2 +-
 .../TestCompactionWithThroughputController.java    |   28 +-
 .../TestFlushWithThroughputController.java         |   32 +-
 .../throttle/TestStoreHotnessProtector.java        |   25 +-
 .../hbase/regionserver/wal/AbstractTestFSWAL.java  |   88 +-
 .../wal/AbstractTestLogRollPeriod.java             |   10 +-
 .../regionserver/wal/AbstractTestLogRolling.java   |   28 +-
 .../regionserver/wal/AbstractTestProtobufLog.java  |   34 +-
 .../regionserver/wal/AbstractTestWALReplay.java    |  311 +--
 .../regionserver/wal/FaultyProtobufLogReader.java  |   13 +-
 .../regionserver/wal/InstrumentedLogWriter.java    |   22 +-
 .../hbase/regionserver/wal/TestAsyncFSWAL.java     |   96 +-
 .../regionserver/wal/TestAsyncFSWALDurability.java |    2 +-
 .../regionserver/wal/TestAsyncFSWALRollStuck.java  |    2 +-
 .../regionserver/wal/TestAsyncLogRollPeriod.java   |    4 +-
 .../regionserver/wal/TestAsyncLogRolling.java      |    4 +-
 .../regionserver/wal/TestAsyncProtobufLog.java     |    5 +-
 .../hbase/regionserver/wal/TestAsyncWALReplay.java |    6 +-
 .../wal/TestAsyncWALReplayCompressed.java          |    4 +-
 .../wal/TestAsyncWALReplayValueCompression.java    |    4 +-
 .../hbase/regionserver/wal/TestCompressor.java     |   32 +-
 .../regionserver/wal/TestCustomWALCellCodec.java   |    9 +-
 .../hbase/regionserver/wal/TestDurability.java     |   29 +-
 .../hadoop/hbase/regionserver/wal/TestFSHLog.java  |   81 +-
 .../regionserver/wal/TestFSHLogDurability.java     |    4 +-
 .../hbase/regionserver/wal/TestFSWALEntry.java     |    5 +-
 .../hbase/regionserver/wal/TestHBaseWalOnEC.java   |    1 -
 .../hbase/regionserver/wal/TestLogRollAbort.java   |   38 +-
 .../hbase/regionserver/wal/TestLogRollPeriod.java  |    4 +-
 .../hbase/regionserver/wal/TestLogRolling.java     |   47 +-
 .../regionserver/wal/TestLogRollingNoCluster.java  |   38 +-
 .../hbase/regionserver/wal/TestMetricsWAL.java     |    8 +-
 .../hbase/regionserver/wal/TestProtobufLog.java    |    4 +-
 .../regionserver/wal/TestSecureAsyncWALReplay.java |    4 +-
 .../regionserver/wal/TestSecureWALReplay.java      |    4 +-
 .../regionserver/wal/TestSequenceIdAccounting.java |   16 +-
 .../hbase/regionserver/wal/TestSyncFuture.java     |    4 +-
 .../regionserver/wal/TestSyncFutureCache.java      |    7 +-
 .../regionserver/wal/TestWALActionsListener.java   |   21 +-
 .../wal/TestWALCellCodecWithCompression.java       |   58 +-
 .../regionserver/wal/TestWALConfiguration.java     |   29 +-
 .../hbase/regionserver/wal/TestWALOpenError.java   |   20 +-
 .../hbase/regionserver/wal/TestWALReplay.java      |    4 +-
 .../wal/TestWALReplayBoundedLogWriterCreation.java |    5 +-
 .../regionserver/wal/TestWALReplayCompressed.java  |    4 +-
 .../wal/TestWALReplayValueCompression.java         |    4 +-
 .../regionserver/wal/WALDurabilityTestBase.java    |    8 +-
 .../replication/DummyReplicationEndpoint.java      |    2 +-
 .../hbase/replication/ReplicationSourceDummy.java  |   12 +-
 .../replication/SerialReplicationTestBase.java     |    9 +-
 .../TestAddToSerialReplicationPeer.java            |    6 +-
 .../replication/TestClaimReplicationQueue.java     |    6 +-
 .../hbase/replication/TestMasterReplication.java   |  187 +-
 .../replication/TestMultiSlaveReplication.java     |   52 +-
 .../replication/TestNamespaceReplication.java      |   34 +-
 ...TestNamespaceReplicationWithBulkLoadedData.java |   97 +-
 .../TestNonHBaseReplicationEndpoint.java           |   16 +-
 .../replication/TestPerTableCFReplication.java     |   85 +-
 .../TestRemoveFromSerialReplicationPeer.java       |    2 +-
 .../hbase/replication/TestReplicationBase.java     |   28 +-
 .../TestReplicationChangingPeerRegionservers.java  |   15 +-
 .../TestReplicationDisableInactivePeer.java        |   17 +-
 .../replication/TestReplicationDroppedTables.java  |   20 +-
 ...ReplicationEditsDroppedWithDeletedTableCFs.java |   28 +-
 ...estReplicationEditsDroppedWithDroppedTable.java |   28 +-
 .../TestReplicationEmptyWALRecovery.java           |   15 +-
 .../hbase/replication/TestReplicationEndpoint.java |   94 +-
 .../replication/TestReplicationKillMasterRS.java   |    2 +-
 .../TestReplicationKillMasterRSCompressed.java     |    8 +-
 ...ReplicationKillMasterRSWithSeparateOldWALs.java |    2 +-
 .../hbase/replication/TestReplicationKillRS.java   |    6 +-
 .../replication/TestReplicationKillSlaveRS.java    |    2 +-
 ...tReplicationKillSlaveRSWithSeparateOldWALs.java |    3 +-
 .../replication/TestReplicationMetricsforUI.java   |   11 +-
 .../replication/TestReplicationProcedureRetry.java |   11 +-
 .../replication/TestReplicationSmallTests.java     |   18 +-
 .../hbase/replication/TestReplicationStatus.java   |   25 +-
 .../TestReplicationStatusAfterLagging.java         |    2 +-
 ...licationStatusBothNormalAndRecoveryLagging.java |    2 +-
 .../replication/TestReplicationStatusSink.java     |   13 +-
 ...ationStatusSourceStartedTargetStoppedNewOp.java |    2 +-
 ...ationStatusSourceStartedTargetStoppedNoOps.java |    2 +-
 ...atusSourceStartedTargetStoppedWithRecovery.java |    4 +-
 .../TestReplicationStuckWithDeletedTableCFs.java   |   27 +-
 .../TestReplicationStuckWithDroppedTable.java      |   26 +-
 .../replication/TestReplicationSyncUpTool.java     |   12 +-
 .../replication/TestReplicationSyncUpToolBase.java |    2 +-
 .../TestReplicationWALEntryFilters.java            |   61 +-
 .../hbase/replication/TestReplicationWithTags.java |   29 +-
 .../hbase/replication/TestSerialReplication.java   |   14 +-
 .../replication/TestSerialReplicationFailover.java |    2 +-
 .../TestVerifyCellsReplicationEndpoint.java        |    2 +-
 .../replication/master/TestTableCFsUpdater.java    |    8 +-
 ...estReplicationEndpointWithMultipleAsyncWAL.java |    4 +-
 .../TestReplicationEndpointWithMultipleWAL.java    |    4 +-
 ...KillMasterRSCompressedWithMultipleAsyncWAL.java |   10 +-
 ...ationKillMasterRSCompressedWithMultipleWAL.java |   10 +-
 ...tReplicationSyncUpToolWithMultipleAsyncWAL.java |    4 +-
 .../TestReplicationSyncUpToolWithMultipleWAL.java  |    2 +-
 .../regionserver/TestBasicWALEntryStream.java      |   12 +-
 .../TestBasicWALEntryStreamAsyncFSWAL.java         |    2 +-
 .../TestBasicWALEntryStreamFSHLog.java             |    2 +-
 .../regionserver/TestDumpReplicationQueues.java    |   36 +-
 .../TestGlobalReplicationThrottler.java            |   26 +-
 ...InterClusterReplicationEndpointFilterEdits.java |   37 +-
 .../TestMetaRegionReplicaReplicationEndpoint.java  |   60 +-
 .../TestRaceWhenCreatingReplicationSource.java     |    2 +-
 .../TestRefreshPeerWhileRegionServerRestarts.java  |    6 +-
 .../TestRefreshRecoveredReplication.java           |   26 +-
 .../TestRegionReplicaReplicationEndpoint.java      |  101 +-
 ...stRegionReplicaReplicationEndpointNoMaster.java |   58 +-
 .../regionserver/TestReplicationCompressedWAL.java |    5 +-
 .../regionserver/TestReplicationSink.java          |  104 +-
 .../regionserver/TestReplicationSinkManager.java   |   24 +-
 .../regionserver/TestReplicationSource.java        |  187 +-
 .../TestReplicationSourceLogQueue.java             |    9 +-
 .../regionserver/TestReplicationSourceManager.java |  146 +-
 .../TestReplicationSourceManagerJoin.java          |    8 +-
 .../TestReplicationSourceManagerZkImpl.java        |    8 +-
 .../regionserver/TestReplicationThrottler.java     |   38 +-
 .../TestReplicationValueCompressedWAL.java         |    4 +-
 .../replication/regionserver/TestReplicator.java   |   16 +-
 .../regionserver/TestSerialReplicationChecker.java |    4 +-
 .../TestSerialReplicationEndpoint.java             |   27 +-
 .../TestSourceFSConfigurationProvider.java         |   26 +-
 .../regionserver/TestWALEntrySinkFilter.java       |  120 +-
 .../TestWALEntryStreamDifferentCounts.java         |    2 +-
 ...estWALEntryStreamDifferentCountsAsyncFSWAL.java |    5 +-
 .../TestWALEntryStreamDifferentCountsFSHLog.java   |    2 +-
 .../regionserver/WALEntryStreamTestBase.java       |    2 +-
 ...adoopSecurityEnabledUserProviderForTesting.java |    4 +-
 .../hadoop/hbase/security/TestSecureIPC.java       |   81 +-
 .../org/apache/hadoop/hbase/security/TestUser.java |   74 +-
 .../TestUsersOperationsWithSecureHadoop.java       |   12 +-
 .../hbase/security/access/SecureTestUtil.java      |  318 +--
 .../security/access/TestAccessControlFilter.java   |   19 +-
 .../security/access/TestAccessController.java      |  704 +++--
 .../security/access/TestAccessController2.java     |  110 +-
 .../security/access/TestAccessController3.java     |   74 +-
 .../access/TestCellACLWithMultipleVersions.java    |  168 +-
 .../hadoop/hbase/security/access/TestCellACLs.java |   83 +-
 .../TestCoprocessorWhitelistMasterObserver.java    |  157 +-
 .../hbase/security/access/TestHDFSAclHelper.java   |   63 +-
 .../security/access/TestNamespaceCommands.java     |  129 +-
 .../security/access/TestPermissionBuilder.java     |   18 +-
 .../hbase/security/access/TestRpcAccessChecks.java |  105 +-
 .../security/access/TestScanEarlyTermination.java  |   23 +-
 .../TestSnapshotScannerHDFSAclController.java      |   34 +-
 .../TestSnapshotScannerHDFSAclController2.java     |   31 +-
 .../security/access/TestTablePermissions.java      |  159 +-
 .../access/TestUnloadAccessController.java         |   12 +-
 .../access/TestWithDisabledAuthorization.java      |  193 +-
 .../security/access/TestZKPermissionWatcher.java   |   21 +-
 .../CustomSaslAuthenticationProviderTestBase.java  |   12 +-
 ...omSaslAuthenticationProviderNettyRpcServer.java |    2 +-
 ...mSaslAuthenticationProviderSimpleRpcServer.java |    2 +-
 .../TestSaslServerAuthenticationProviders.java     |   41 +-
 .../hbase/security/token/SecureTestCluster.java    |   29 +-
 .../security/token/TestAuthenticationKey.java      |    6 +-
 .../token/TestDelegationTokenWithEncryption.java   |    8 +-
 .../security/token/TestFsDelegationToken.java      |   37 +-
 .../token/TestGenerateDelegationToken.java         |   11 +-
 .../security/token/TestTokenAuthentication.java    |  186 +-
 .../hbase/security/token/TestZKSecretWatcher.java  |   65 +-
 .../token/TestZKSecretWatcherRefreshKeys.java      |   21 +-
 .../ExpAsStringVisibilityLabelServiceImpl.java     |   85 +-
 .../LabelFilteringScanLabelGenerator.java          |    5 +-
 .../LoadTestDataGeneratorWithVisibilityLabels.java |   42 +-
 .../TestDefaultScanLabelGeneratorStack.java        |   22 +-
 .../TestEnforcingScanLabelGenerator.java           |   16 +-
 .../visibility/TestExpressionExpander.java         |   83 +-
 .../security/visibility/TestExpressionParser.java  |   30 +-
 ...tVisibilityLabelReplicationWithExpAsString.java |   44 +-
 .../security/visibility/TestVisibilityLabels.java  |  175 +-
 ...tVisibilityLabelsOnNewVersionBehaviorTable.java |   15 +-
 ...tVisibilityLabelsOpWithDifferentUsersNoACL.java |  104 +-
 .../TestVisibilityLabelsReplication.java           |  123 +-
 .../visibility/TestVisibilityLabelsWithACL.java    |  123 +-
 ...estVisibilityLabelsWithCustomVisLabService.java |   13 +-
 ...VisibilityLabelsWithDefaultVisLabelService.java |  199 +-
 .../TestVisibilityLabelsWithDeletes.java           |   90 +-
 .../TestVisibilityLabelsWithSLGStack.java          |   30 +-
 .../visibility/TestVisibilityLablesWithGroups.java |   33 +-
 .../visibility/TestVisibilityWithCheckAuths.java   |   79 +-
 .../visibility/TestWithDisabledAuthorization.java  |   39 +-
 .../VisibilityLabelsWithDeletesTestBase.java       |    4 +-
 .../security/visibility/VisibilityTestUtil.java    |   26 +-
 .../hbase/snapshot/MobSnapshotTestingUtils.java    |   13 +-
 .../hbase/snapshot/SnapshotTestingUtils.java       |  355 ++-
 .../TestConcurrentFlushSnapshotFromClient.java     |    4 +-
 .../snapshot/TestFlushSnapshotFromClient.java      |   64 +-
 .../snapshot/TestMobFlushSnapshotFromClient.java   |   15 +-
 .../TestMobRestoreFlushSnapshotFromClient.java     |   15 +-
 .../snapshot/TestMobRestoreSnapshotHelper.java     |    6 +-
 .../hbase/snapshot/TestRegionSnapshotTask.java     |   55 +-
 .../TestRestoreFlushSnapshotFromClient.java        |   43 +-
 .../hbase/snapshot/TestRestoreSnapshotHelper.java  |   39 +-
 .../hbase/snapshot/TestSnapshotClientRetries.java  |   27 +-
 .../snapshot/TestSnapshotDescriptionUtils.java     |  113 +-
 .../hbase/snapshot/TestSnapshotManifest.java       |   33 +-
 .../hbase/snapshot/TestSnapshotStoreFileSize.java  |   17 +-
 .../snapshot/TestSnapshotWhenChoreCleaning.java    |   13 +-
 .../hadoop/hbase/tool/MapreduceTestingShim.java    |   34 +-
 .../hadoop/hbase/tool/TestCanaryStatusServlet.java |   21 +-
 .../apache/hadoop/hbase/tool/TestCanaryTool.java   |    6 +-
 .../hbase/tool/TestLoadIncrementalHFiles.java      |  124 +-
 .../TestLoadIncrementalHFilesSplitRecovery.java    |  127 +-
 .../tool/TestSecureLoadIncrementalHFiles.java      |    4 +-
 ...stSecureLoadIncrementalHFilesSplitRecovery.java |    6 +-
 .../tool/coprocessor/CoprocessorValidatorTest.java |   52 +-
 .../hadoop/hbase/trace/OpenTelemetryClassRule.java |   77 +-
 .../hadoop/hbase/trace/OpenTelemetryTestRule.java  |    4 +-
 .../hadoop/hbase/util/BaseTestHBaseFsck.java       |  181 +-
 .../hadoop/hbase/util/ConstantDelayQueue.java      |    7 +-
 .../apache/hadoop/hbase/util/HBaseHomePath.java    |   34 +-
 .../hadoop/hbase/util/HFileArchiveTestingUtil.java |   44 +-
 .../apache/hadoop/hbase/util/HFileTestUtil.java    |  104 +-
 .../hadoop/hbase/util/LauncherSecurityManager.java |   19 +-
 .../hbase/util/LoadTestDataGeneratorWithMOB.java   |   28 +-
 .../hbase/util/LoadTestDataGeneratorWithTags.java  |   44 +-
 .../org/apache/hadoop/hbase/util/MockServer.java   |   12 +-
 .../hadoop/hbase/util/MultiThreadedAction.java     |  220 +-
 .../hadoop/hbase/util/MultiThreadedReader.java     |  109 +-
 .../hbase/util/MultiThreadedReaderWithACL.java     |   41 +-
 .../hadoop/hbase/util/MultiThreadedUpdater.java    |  111 +-
 .../hbase/util/MultiThreadedUpdaterWithACL.java    |   39 +-
 .../hadoop/hbase/util/MultiThreadedWriter.java     |   22 +-
 .../hadoop/hbase/util/MultiThreadedWriterBase.java |   35 +-
 .../hbase/util/MultiThreadedWriterWithACL.java     |   17 +-
 .../hbase/util/ProcessBasedLocalHBaseCluster.java  |  115 +-
 .../apache/hadoop/hbase/util/RestartMetaTest.java  |   66 +-
 .../hadoop/hbase/util/StoppableImplementation.java |    5 +-
 .../hadoop/hbase/util/TestBloomFilterChunk.java    |   93 +-
 .../util/TestBoundedPriorityBlockingQueue.java     |   13 +-
 .../hadoop/hbase/util/TestByteBuffUtils.java       |    4 +-
 .../hadoop/hbase/util/TestCompressionTest.java     |   40 +-
 .../hadoop/hbase/util/TestConfigurationUtil.java   |    4 +-
 .../hadoop/hbase/util/TestConnectionCache.java     |    2 +-
 .../hbase/util/TestCoprocessorScanPolicy.java      |   28 +-
 .../hbase/util/TestDefaultEnvironmentEdge.java     |   12 +-
 .../hadoop/hbase/util/TestEncryptionTest.java      |   27 +-
 .../hadoop/hbase/util/TestFSTableDescriptors.java  |   22 +-
 .../org/apache/hadoop/hbase/util/TestFSUtils.java  |  146 +-
 .../apache/hadoop/hbase/util/TestFSVisitor.java    |   22 +-
 .../hbase/util/TestFromClientSide3WoUnsafe.java    |    6 +-
 .../TestHBaseFsckCleanReplicationBarriers.java     |   53 +-
 .../hadoop/hbase/util/TestHBaseFsckComparator.java |   16 +-
 .../hadoop/hbase/util/TestHBaseFsckEncryption.java |   22 +-
 .../apache/hadoop/hbase/util/TestHBaseFsckMOB.java |   16 +-
 .../hbase/util/TestHBaseFsckReplication.java       |    8 +-
 .../hadoop/hbase/util/TestHFileArchiveUtil.java    |   14 +-
 .../org/apache/hadoop/hbase/util/TestIdLock.java   |   12 +-
 .../hadoop/hbase/util/TestIdReadWriteLock.java     |   34 +-
 .../util/TestIncrementingEnvironmentEdge.java      |    9 +-
 .../hadoop/hbase/util/TestJSONMetricUtil.java      |    2 +-
 .../hadoop/hbase/util/TestLossyCounting.java       |   15 +-
 .../hbase/util/TestMiniClusterLoadEncoded.java     |   17 +-
 .../hbase/util/TestMiniClusterLoadParallel.java    |   16 +-
 .../hbase/util/TestMiniClusterLoadSequential.java  |   50 +-
 .../apache/hadoop/hbase/util/TestRegionMover1.java |   55 +-
 .../apache/hadoop/hbase/util/TestRegionMover2.java |   23 +-
 .../apache/hadoop/hbase/util/TestRegionMover3.java |   18 +-
 .../hbase/util/TestRegionSplitCalculator.java      |   56 +-
 .../hadoop/hbase/util/TestRegionSplitter.java      |  590 +++--
 .../org/apache/hadoop/hbase/util/TestRootPath.java |    7 +-
 .../apache/hadoop/hbase/util/TestSortedList.java   |   26 +-
 .../hadoop/hbase/util/TestStealJobQueue.java       |   43 +-
 .../compaction/TestMajorCompactionRequest.java     |   44 +-
 .../compaction/TestMajorCompactionTTLRequest.java  |   13 +-
 .../hbase/util/compaction/TestMajorCompactor.java  |   25 +-
 .../util/compaction/TestMajorCompactorTTL.java     |   11 +-
 .../hadoop/hbase/util/hbck/HbckTestingUtil.java    |   30 +-
 .../hbase/util/test/LoadTestDataGenerator.java     |   89 +-
 .../util/test/LoadTestDataGeneratorWithACL.java    |   41 +-
 .../hadoop/hbase/wal/CompressedWALTestBase.java    |   41 +-
 .../org/apache/hadoop/hbase/wal/FaultyFSLog.java   |   14 +-
 .../apache/hadoop/hbase/wal/FileSystemProxy.java   |   17 +-
 .../apache/hadoop/hbase/wal/IOTestProvider.java    |   81 +-
 ...syncFSWALCorruptionDueToDanglingByteBuffer.java |    2 +-
 .../wal/TestBoundedRegionGroupingStrategy.java     |   30 +-
 .../apache/hadoop/hbase/wal/TestCompressedWAL.java |    7 +-
 .../wal/TestCompressedWALValueCompression.java     |   15 +-
 .../apache/hadoop/hbase/wal/TestDisabledWAL.java   |    6 +-
 ...estFSHLogCorruptionDueToDanglingByteBuffer.java |    2 +-
 ...ruptionWithMultiPutDueToDanglingByteBuffer.java |    8 +-
 .../hadoop/hbase/wal/TestFSHLogProvider.java       |   89 +-
 .../hadoop/hbase/wal/TestOutputSinkWriter.java     |   50 +-
 .../hbase/wal/TestRaceBetweenGetWALAndGetWALs.java |    2 +-
 .../hadoop/hbase/wal/TestReadWriteSeqIdFiles.java  |    2 +-
 .../org/apache/hadoop/hbase/wal/TestSecureWAL.java |   10 +-
 .../apache/hadoop/hbase/wal/TestWALFactory.java    |  218 +-
 .../apache/hadoop/hbase/wal/TestWALFiltering.java  |   37 +-
 .../apache/hadoop/hbase/wal/TestWALMethods.java    |   61 +-
 .../hbase/wal/TestWALOpenAfterDNRollingStart.java  |    9 +-
 .../apache/hadoop/hbase/wal/TestWALProvider.java   |   27 +-
 .../hadoop/hbase/wal/TestWALReaderOnSecureWAL.java |   22 +-
 .../apache/hadoop/hbase/wal/TestWALRootDir.java    |   47 +-
 .../org/apache/hadoop/hbase/wal/TestWALSplit.java  |  382 ++-
 .../wal/TestWALSplitBoundedLogWriterCreation.java  |    7 +-
 .../hadoop/hbase/wal/TestWALSplitCompressed.java   |    6 +-
 .../hadoop/hbase/wal/TestWALSplitToHFile.java      |   66 +-
 .../hbase/wal/TestWALSplitValueCompression.java    |   12 +-
 .../wal/TestWALSplitWithDeletedTableData.java      |   17 +-
 .../hadoop/hbase/wal/TestWrongMetaWALFileName.java |    2 +-
 ...LCorruptionDueToDanglingByteBufferTestBase.java |    2 +-
 ...ithMultiPutDueToDanglingByteBufferTestBase.java |   11 +-
 .../hadoop/hbase/wal/WALPerformanceEvaluation.java |  126 +-
 .../hadoop/hbase/zookeeper/TestZooKeeperACL.java   |  108 +-
 hbase-server/src/test/resources/mapred-site.xml    |    1 -
 hbase-shaded/hbase-shaded-check-invariants/pom.xml |   26 +-
 .../hbase-shaded-client-byo-hadoop/pom.xml         |  302 +--
 hbase-shaded/hbase-shaded-client/pom.xml           |   26 +-
 hbase-shaded/hbase-shaded-mapreduce/pom.xml        |  722 ++---
 .../hbase-shaded-testing-util-tester/pom.xml       |    7 +-
 .../shaded/TestShadedHBaseTestingUtility.java      |    5 +-
 hbase-shaded/hbase-shaded-testing-util/pom.xml     |   19 +-
 .../shaded/org/eclipse/jetty/webapp/webdefault.xml |    1 -
 .../pom.xml                                        |   26 +-
 hbase-shaded/pom.xml                               |  130 +-
 hbase-shell/pom.xml                                |  121 +-
 .../hadoop/hbase/client/AbstractTestShell.java     |    3 +-
 .../apache/hadoop/hbase/client/TestAdminShell.java |    5 +-
 .../hadoop/hbase/client/TestAdminShell2.java       |    5 +-
 .../hadoop/hbase/client/TestChangeSftShell.java    |    2 +-
 .../hadoop/hbase/client/TestQuotasShell.java       |    5 +-
 .../hadoop/hbase/client/TestRSGroupShell.java      |    9 +-
 .../hadoop/hbase/client/TestReplicationShell.java  |    7 +-
 .../org/apache/hadoop/hbase/client/TestShell.java  |    9 +-
 .../hadoop/hbase/client/TestShellNoCluster.java    |    5 +-
 .../apache/hadoop/hbase/client/TestTableShell.java |    5 +-
 .../hbase/client/procedure/ShellTestProcedure.java |   13 +-
 hbase-testing-util/pom.xml                         |   26 +-
 .../hadoop/hbase/testing/TestingHBaseCluster.java  |    2 +-
 .../hbase/testing/TestingHBaseClusterImpl.java     |    2 +-
 .../hbase/testing/TestingHBaseClusterOption.java   |   10 +-
 .../hadoop/hbase/TestHBaseTestingUtilSpinup.java   |    8 +-
 .../hbase/testing/TestTestingHBaseCluster.java     |    2 +-
 .../testing/TestTestingHBaseClusterImplForCPs.java |    2 +-
 hbase-thrift/pom.xml                               |  257 +-
 .../org/apache/hadoop/hbase/thrift/CallQueue.java  |   22 +-
 .../org/apache/hadoop/hbase/thrift/Constants.java  |   61 +-
 .../hadoop/hbase/thrift/HBaseServiceHandler.java   |   19 +-
 .../hbase/thrift/HThreadedSelectorServerArgs.java  |   71 +-
 .../hbase/thrift/HbaseHandlerMetricsProxy.java     |   42 +-
 .../hbase/thrift/HttpAuthenticationException.java  |   18 +-
 .../org/apache/hadoop/hbase/thrift/ImplType.java   |   13 +-
 .../hadoop/hbase/thrift/IncrementCoalescer.java    |   41 +-
 .../hbase/thrift/IncrementCoalescerMBean.java      |    1 -
 .../hbase/thrift/TBoundedThreadPoolServer.java     |  114 +-
 .../hbase/thrift/THBaseThreadPoolExecutor.java     |   13 +-
 .../hbase/thrift/ThriftHBaseServiceHandler.java    |  469 ++--
 .../hadoop/hbase/thrift/ThriftHttpServlet.java     |   64 +-
 .../apache/hadoop/hbase/thrift/ThriftMetrics.java  |   54 +-
 .../apache/hadoop/hbase/thrift/ThriftServer.java   |  339 ++-
 .../hadoop/hbase/thrift/ThriftUtilities.java       |  121 +-
 .../hbase/thrift2/ThriftHBaseServiceHandler.java   |  118 +-
 .../apache/hadoop/hbase/thrift2/ThriftServer.java  |   23 +-
 .../hadoop/hbase/thrift2/ThriftUtilities.java      |  622 ++---
 .../hadoop/hbase/thrift2/client/ThriftAdmin.java   |  125 +-
 .../hbase/thrift2/client/ThriftClientBuilder.java  |    4 +-
 .../hbase/thrift2/client/ThriftConnection.java     |   45 +-
 .../hadoop/hbase/thrift2/client/ThriftTable.java   |   88 +-
 .../hbase/thrift/ErrorThrowingGetObserver.java     |    6 +-
 .../hbase/thrift/HBaseThriftTestingUtility.java    |    9 +-
 .../hbase/thrift/TestBindExceptionHandling.java    |   12 +-
 .../apache/hadoop/hbase/thrift/TestCallQueue.java  |   24 +-
 .../hadoop/hbase/thrift/TestThriftHttpServer.java  |   31 +-
 .../hadoop/hbase/thrift/TestThriftServer.java      |  303 +--
 .../hbase/thrift/TestThriftServerCmdLine.java      |   76 +-
 .../thrift/TestThriftSpnegoHttpFallbackServer.java |   58 +-
 .../hbase/thrift/TestThriftSpnegoHttpServer.java   |   62 +-
 .../hadoop/hbase/thrift/ThriftServerRunner.java    |   18 +-
 .../hbase/thrift2/TestThrift2HttpServer.java       |   11 +-
 .../hbase/thrift2/TestThrift2ServerCmdLine.java    |   14 +-
 .../hadoop/hbase/thrift2/TestThriftConnection.java |  134 +-
 .../thrift2/TestThriftHBaseServiceHandler.java     |  305 +--
 .../TestThriftHBaseServiceHandlerWithLabels.java   |  118 +-
 .../TestThriftHBaseServiceHandlerWithReadOnly.java |   44 +-
 hbase-zookeeper/pom.xml                            |  164 +-
 .../hbase/zookeeper/ClusterStatusTracker.java      |   46 +-
 .../hadoop/hbase/zookeeper/DeletionListener.java   |   18 +-
 .../hadoop/hbase/zookeeper/EmptyWatcher.java       |    7 +-
 .../apache/hadoop/hbase/zookeeper/HQuorumPeer.java |   56 +-
 .../hadoop/hbase/zookeeper/InstancePending.java    |   15 +-
 .../hbase/zookeeper/LoadBalancerTracker.java       |   15 +-
 .../hbase/zookeeper/MasterAddressTracker.java      |  122 +-
 .../zookeeper/MasterMaintenanceModeTracker.java    |   15 +-
 .../hadoop/hbase/zookeeper/MetaTableLocator.java   |  110 +-
 .../hbase/zookeeper/MiniZooKeeperCluster.java      |   72 +-
 .../hadoop/hbase/zookeeper/PendingWatcher.java     |   21 +-
 .../hbase/zookeeper/RecoverableZooKeeper.java      |  208 +-
 .../hbase/zookeeper/RegionNormalizerTracker.java   |   15 +-
 .../hbase/zookeeper/SnapshotCleanupTracker.java    |   46 +-
 .../apache/hadoop/hbase/zookeeper/ZKAclReset.java  |   25 +-
 .../hadoop/hbase/zookeeper/ZKAuthentication.java   |  116 +-
 .../apache/hadoop/hbase/zookeeper/ZKClusterId.java |   21 +-
 .../org/apache/hadoop/hbase/zookeeper/ZKDump.java  |   46 +-
 .../hadoop/hbase/zookeeper/ZKLeaderManager.java    |   45 +-
 .../apache/hadoop/hbase/zookeeper/ZKListener.java  |   13 +-
 .../hadoop/hbase/zookeeper/ZKMainServer.java       |   19 +-
 .../hadoop/hbase/zookeeper/ZKNodeTracker.java      |   86 +-
 .../hadoop/hbase/zookeeper/ZKServerTool.java       |    9 +-
 .../apache/hadoop/hbase/zookeeper/ZKSplitLog.java  |   25 +-
 .../org/apache/hadoop/hbase/zookeeper/ZKUtil.java  |  871 +++---
 .../apache/hadoop/hbase/zookeeper/ZKWatcher.java   |  177 +-
 .../apache/hadoop/hbase/HBaseZKTestingUtility.java |    7 +-
 .../hadoop/hbase/zookeeper/TestHQuorumPeer.java    |   25 +-
 .../hbase/zookeeper/TestInstancePending.java       |    4 +-
 .../hbase/zookeeper/TestMasterAddressTracker.java  |    4 +-
 .../hbase/zookeeper/TestReadOnlyZKClient.java      |    6 +-
 .../hbase/zookeeper/TestRecoverableZooKeeper.java  |   14 +-
 .../hbase/zookeeper/TestZKLeaderManager.java       |   43 +-
 .../hadoop/hbase/zookeeper/TestZKMainServer.java   |   11 +-
 .../apache/hadoop/hbase/zookeeper/TestZKMulti.java |   66 +-
 .../hadoop/hbase/zookeeper/TestZKNodeTracker.java  |   38 +-
 .../apache/hadoop/hbase/zookeeper/TestZKUtil.java  |   13 +-
 .../hadoop/hbase/zookeeper/TestZKUtilNoServer.java |    8 +-
 4601 files changed, 120217 insertions(+), 143729 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 527e543dec4..1a342a87559 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -32,7 +32,7 @@ These release notes cover new developer and user-facing incompatibilities, impor
 
 See the document http://hbase.apache.org/book.html#upgrade2.2 about how to upgrade from 2.0 or 2.1 to 2.2+.
 
-HBase 2.2+ uses a new Procedure form assiging/unassigning/moving Regions. It does not process HBase 2.1 and 2.0's Unassign/Assign Procedure types. Upgrade requires that we first drain the Master Procedure Store of old style Procedures before starting the new 2.2 Master. So you need to make sure that before you kill the old version (2.0 or 2.1) Master, there is no region in transition. And once the new version (2.2+) Master is up, you can rolling upgrade RegionServers one by one. 
+HBase 2.2+ uses a new Procedure form assiging/unassigning/moving Regions. It does not process HBase 2.1 and 2.0's Unassign/Assign Procedure types. Upgrade requires that we first drain the Master Procedure Store of old style Procedures before starting the new 2.2 Master. So you need to make sure that before you kill the old version (2.0 or 2.1) Master, there is no region in transition. And once the new version (2.2+) Master is up, you can rolling upgrade RegionServers one by one.
 
 And there is a more safer way if you are running 2.1.1+ or 2.0.3+ cluster. It need four steps to upgrade Master.
 
@@ -421,15 +421,15 @@ Previously the recovered.edits directory was under the root directory. This JIRA
 
 When oldwals (and hfile) cleaner cleans stale wals (and hfiles), it will periodically check and wait the clean results from filesystem, the total wait time will be no more than a max time.
 
-The periodically wait and check configurations are hbase.oldwals.cleaner.thread.check.interval.msec (default is 500 ms) and hbase.regionserver.hfilecleaner.thread.check.interval.msec (default is 1000 ms). 
+The periodically wait and check configurations are hbase.oldwals.cleaner.thread.check.interval.msec (default is 500 ms) and hbase.regionserver.hfilecleaner.thread.check.interval.msec (default is 1000 ms).
 
 Meanwhile, The max time configurations are hbase.oldwals.cleaner.thread.timeout.msec and hbase.regionserver.hfilecleaner.thread.timeout.msec, they are set to 60 seconds by default.
 
 All support dynamic configuration.
 
-e.g. in the oldwals cleaning scenario, one may consider tuning hbase.oldwals.cleaner.thread.timeout.msec and hbase.oldwals.cleaner.thread.check.interval.msec 
+e.g. in the oldwals cleaning scenario, one may consider tuning hbase.oldwals.cleaner.thread.timeout.msec and hbase.oldwals.cleaner.thread.check.interval.msec
 
-1. While deleting a oldwal never complete (strange but possible), then delete file task needs to wait for a max of 60 seconds. Here, 60 seconds might be too long, or the opposite way is to increase more than 60 seconds in the use cases of slow file delete. 
+1. While deleting a oldwal never complete (strange but possible), then delete file task needs to wait for a max of 60 seconds. Here, 60 seconds might be too long, or the opposite way is to increase more than 60 seconds in the use cases of slow file delete.
 2. The check and wait of a file delete is set to default in the period of 500 milliseconds, one might want to tune this checking period to a short interval to check more frequently or to a longer interval to avoid checking too often to manage their delete file task checking period (the longer interval may be use to avoid checking too fast while using a high latency storage).
 
 
@@ -461,12 +461,12 @@ Solution: After this jira, the compaction event tracker will be writed to HFile.
 
 * [HBASE-21820](https://issues.apache.org/jira/browse/HBASE-21820) | *Major* | **Implement CLUSTER quota scope**
 
-HBase contains two quota scopes: MACHINE and CLUSTER. Before this patch, set quota operations did not expose scope option to client api and use MACHINE as default, CLUSTER scope can not be set and used. 
+HBase contains two quota scopes: MACHINE and CLUSTER. Before this patch, set quota operations did not expose scope option to client api and use MACHINE as default, CLUSTER scope can not be set and used.
 Shell commands are as follows:
 set\_quota, TYPE =\> THROTTLE, TABLE =\> 't1', LIMIT =\> '10req/sec'
 
 This issue implements CLUSTER scope in a simple way: For user, namespace, user over namespace quota, use [ClusterLimit / RSNum] as machine limit. For table and user over table quota, use [ClusterLimit / TotalTableRegionNum \* MachineTableRegionNum] as machine limit.
-After this patch, user can set CLUSTER scope quota, but MACHINE is still default if user ignore scope. 
+After this patch, user can set CLUSTER scope quota, but MACHINE is still default if user ignore scope.
 Shell commands are as follows:
 set\_quota, TYPE =\> THROTTLE, TABLE =\> 't1', LIMIT =\> '10req/sec'
 set\_quota, TYPE =\> THROTTLE, TABLE =\> 't1', LIMIT =\> '10req/sec', SCOPE =\> MACHINE
@@ -491,11 +491,11 @@ Remove bloom filter type ROWPREFIX\_DELIMITED. May add it back when find a bette
 
 * [HBASE-21783](https://issues.apache.org/jira/browse/HBASE-21783) | *Major* | **Support exceed user/table/ns throttle quota if region server has available quota**
 
-Support enable or disable exceed throttle quota. Exceed throttle quota means, user can over consume user/namespace/table quota if region server has additional available quota because other users don't consume at the same time. 
+Support enable or disable exceed throttle quota. Exceed throttle quota means, user can over consume user/namespace/table quota if region server has additional available quota because other users don't consume at the same time.
 Use the following shell commands to enable/disable exceed throttle quota: enable\_exceed\_throttle\_quota
 disable\_exceed\_throttle\_quota
-There are two limits when enable exceed throttle quota: 
-1. Must set at least one read and one write region server throttle quota; 
+There are two limits when enable exceed throttle quota:
+1. Must set at least one read and one write region server throttle quota;
 2. All region server throttle quotas must be in seconds time unit. Because once previous requests exceed their quota and consume region server quota, quota in other time units may be refilled in a long time, this may affect later requests.
 
 
@@ -621,7 +621,7 @@ Add a clearRegionLocationCache method in Connection to clear the region location
 
 * [HBASE-21713](https://issues.apache.org/jira/browse/HBASE-21713) | *Major* | **Support set region server throttle quota**
 
-Support set region server rpc throttle quota which represents the read/write ability of region servers and throttles when region server's total requests exceeding the limit. 
+Support set region server rpc throttle quota which represents the read/write ability of region servers and throttles when region server's total requests exceeding the limit.
 
 Use the following shell command to set RS quota:
 set\_quota TYPE =\> THROTTLE, REGIONSERVER =\> 'all', THROTTLE\_TYPE =\> WRITE, LIMIT =\> '20000req/sec'
@@ -650,7 +650,7 @@ Adds shell support for the following:
 
 * [HBASE-21734](https://issues.apache.org/jira/browse/HBASE-21734) | *Major* | **Some optimization in FilterListWithOR**
 
-After HBASE-21620, the filterListWithOR has been a bit slow because we need to merge each sub-filter's RC , while before HBASE-21620, we will skip many RC merging, but the logic was wrong. So here we choose another way to optimaze the performance: removing the KeyValueUtil#toNewKeyCell. 
+After HBASE-21620, the filterListWithOR has been a bit slow because we need to merge each sub-filter's RC , while before HBASE-21620, we will skip many RC merging, but the logic was wrong. So here we choose another way to optimaze the performance: removing the KeyValueUtil#toNewKeyCell.
 Anoop Sam John suggested that the KeyValueUtil#toNewKeyCell can save some GC before because if we copy key part of cell into a single byte[], then the block the cell refering won't be refered by the filter list any more, the upper layer can GC the data block quickly. while after HBASE-21620, we will update the prevCellList for every encountered cell now, so the lifecycle of cell in prevCellList for FilterList will be quite shorter. so just use the cell ref for saving cpu.
 BTW, we removed all the arrays streams usage in filter list, because it's also quite time-consuming in our test.
 
@@ -702,15 +702,15 @@ Python3 support was added to dev-support/submit-patch.py. To install newly requi
 In HBASE-21657,  I simplified the path of estimatedSerialiedSize() & estimatedSerialiedSizeOfCell() by moving the general getSerializedSize()
 and heapSize() from ExtendedCell to Cell interface. The patch also included some other improvments:
 
-1. For 99%  of case, our cells has no tags, so let the HFileScannerImpl just return the NoTagsByteBufferKeyValue if no tags, which means we can save 
-   lots of cpu time when sending no tags cell to rpc because can just return the length instead of getting the serialize size by caculating offset/length 
+1. For 99%  of case, our cells has no tags, so let the HFileScannerImpl just return the NoTagsByteBufferKeyValue if no tags, which means we can save
+   lots of cpu time when sending no tags cell to rpc because can just return the length instead of getting the serialize size by caculating offset/length
    of each fields(row/cf/cq..)
 2. Move the subclass's getSerializedSize implementation from ExtendedCell to their own class, which mean we did not need to call ExtendedCell's
    getSerialiedSize() firstly, then forward to subclass's getSerializedSize(withTags).
 3. Give a estimated result arraylist size for avoiding the frequent list extension when in a big scan, now we estimate the array size as min(scan.rows, 512).
    it's also help a lot.
 
-We gain almost ~40% throughput improvement in 100% scan case for branch-2 (cacheHitRatio~100%)[1], it's a good thing. While it's a incompatible change in 
+We gain almost ~40% throughput improvement in 100% scan case for branch-2 (cacheHitRatio~100%)[1], it's a good thing. While it's a incompatible change in
 some case, such as if the upstream user implemented their own Cells, although it's rare but can happen, then their compile will be error.
 
 
@@ -732,7 +732,7 @@ Before this issue, thrift1 server and thrift2 server are totally different serve
 
 * [HBASE-21661](https://issues.apache.org/jira/browse/HBASE-21661) | *Major* | **Provide Thrift2 implementation of Table/Admin**
 
-ThriftAdmin/ThriftTable are implemented based on Thrift2. With ThriftAdmin/ThriftTable, People can use thrift2 protocol just like HTable/HBaseAdmin. 
+ThriftAdmin/ThriftTable are implemented based on Thrift2. With ThriftAdmin/ThriftTable, People can use thrift2 protocol just like HTable/HBaseAdmin.
 Example of using ThriftConnection
 Configuration conf = HBaseConfiguration.create();
 conf.set(ClusterConnection.HBASE\_CLIENT\_CONNECTION\_IMPL,ThriftConnection.class.getName());
@@ -766,7 +766,7 @@ Add a new configuration "hbase.skip.load.duplicate.table.coprocessor". The defau
 
 * [HBASE-21650](https://issues.apache.org/jira/browse/HBASE-21650) | *Major* | **Add DDL operation and some other miscellaneous to thrift2**
 
-Added DDL operations and some other structure definition to thrift2. Methods added: 
+Added DDL operations and some other structure definition to thrift2. Methods added:
 create/modify/addColumnFamily/deleteColumnFamily/modifyColumnFamily/enable/disable/truncate/delete table
 create/modify/delete namespace
 get(list)TableDescriptor(s)/get(list)NamespaceDescirptor(s)
@@ -845,8 +845,8 @@ hbase(main):003:0> rit
 hbase(main):004:0> unassign '56f0c38c81ae453d19906ce156a2d6a1'
 0 row(s) in 0.0540 seconds
 
-hbase(main):005:0> rit 
-IntegrationTestBigLinkedList,L\xCC\xCC\xCC\xCC\xCC\xCC\xCB,1539117183224.56f0c38c81ae453d19906ce156a2d6a1. state=PENDING_CLOSE, ts=Tue Oct 09 20:33:34 UTC 2018 (0s ago), server=null                                                                                                                                                                                   
+hbase(main):005:0> rit
+IntegrationTestBigLinkedList,L\xCC\xCC\xCC\xCC\xCC\xCC\xCB,1539117183224.56f0c38c81ae453d19906ce156a2d6a1. state=PENDING_CLOSE, ts=Tue Oct 09 20:33:34 UTC 2018 (0s ago), server=null
 1 row(s) in 0.0170 seconds
 ```
 
@@ -1329,7 +1329,7 @@ This represents an incompatible change for users who relied on this implementati
 
 This enhances the AccessControlClient APIs to retrieve the permissions based on namespace, table name, family and qualifier for specific user. AccessControlClient can also validate a user whether allowed to perform specified operations on a particular table.
 Following APIs have been added,
-1) getUserPermissions(Connection connection, String tableRegex, byte[] columnFamily, byte[] columnQualifier, String userName) 
+1) getUserPermissions(Connection connection, String tableRegex, byte[] columnFamily, byte[] columnQualifier, String userName)
 	 Scope of retrieving permission will be same as existing.
 2) hasPermission(onnection connection, String tableName, byte[] columnFamily, byte[] columnQualifier, String userName, Permission.Action... actions)
      Scope of validating user privilege,
@@ -2095,11 +2095,11 @@ ColumnValueFilter provides a way to fetch matched cells only by providing specif
 
 A region is flushed if its memory component exceeds the region flush threshold.
 A flush policy decides which stores to flush by comparing the size of the store to a column-family-flush threshold.
-If the overall size of all memstores in the machine exceeds the bounds defined by the administrator (denoted global pressure) a region is selected and flushed. 
+If the overall size of all memstores in the machine exceeds the bounds defined by the administrator (denoted global pressure) a region is selected and flushed.
 HBASE-18294 changes flush decisions to be based on heap-occupancy and not data (key-value) size, consistently across levels. This rolls back some of the changes by HBASE-16747. Specifically,
 (1) RSs, Regions and stores track their overall on-heap and off-heap occupancy,
 (2) A region is flushed when its on-heap+off-heap size exceeds the region flush threshold specified in hbase.hregion.memstore.flush.size,
-(3) The store to be flushed is chosen based on its on-heap+off-heap size 
+(3) The store to be flushed is chosen based on its on-heap+off-heap size
 (4) At the RS level, a flush is triggered when the overall on-heap exceeds the on-heap limit, or when the overall off-heap size exceeds the off-heap limit (low/high water marks).
 
 Note that when the region flush size is set to XXmb a region flush may be triggered even before writing keys and values of size XX because the total heap occupancy of the region which includes additional metadata exceeded the threshold.
@@ -2615,13 +2615,13 @@ And for server side, the default hbase.client.serverside.retries.multiplier was
 
 * [HBASE-18090](https://issues.apache.org/jira/browse/HBASE-18090) | *Major* | **Improve TableSnapshotInputFormat to allow more multiple mappers per region**
 
-In this task, we make it possible to run multiple mappers per region in the table snapshot. The following code is primary table snapshot mapper initializatio: 
+In this task, we make it possible to run multiple mappers per region in the table snapshot. The following code is primary table snapshot mapper initializatio:
 
 TableMapReduceUtil.initTableSnapshotMapperJob(
           snapshotName,                     // The name of the snapshot (of a table) to read from
           scan,                                      // Scan instance to control CF and attribute selection
           mapper,                                 // mapper
-          outputKeyClass,                   // mapper output key 
+          outputKeyClass,                   // mapper output key
           outputValueClass,                // mapper output value
           job,                                       // The current job to adjust
           true,                                     // upload HBase jars and jars for any of the configured job classes via the distributed cache (tmpjars)
@@ -2634,7 +2634,7 @@ TableMapReduceUtil.initTableSnapshotMapperJob(
           snapshotName,                     // The name of the snapshot (of a table) to read from
           scan,                                      // Scan instance to control CF and attribute selection
           mapper,                                 // mapper
-          outputKeyClass,                   // mapper output key 
+          outputKeyClass,                   // mapper output key
           outputValueClass,                // mapper output value
           job,                                       // The current job to adjust
           true,                                     // upload HBase jars and jars for any of the configured job classes via the distributed cache (tmpjars)
@@ -2672,7 +2672,7 @@ List\<Tag\> getTags()
 Optional\<Tag\> getTag(byte type)
 byte[] cloneTags()
 
-The above APIs helps to read tags from the Cell. 
+The above APIs helps to read tags from the Cell.
 
 CellUtil#createCell(Cell cell, List\<Tag\> tags)
 CellUtil#createCell(Cell cell, byte[] tags)
@@ -2808,7 +2808,7 @@ Change the import order rule that now we should put the shaded import at bottom.
 * [HBASE-19187](https://issues.apache.org/jira/browse/HBASE-19187) | *Minor* | **Remove option to create on heap bucket cache**
 
 Removing the on heap Bucket cache feature.
-The config "hbase.bucketcache.ioengine" no longer support the 'heap' value. 
+The config "hbase.bucketcache.ioengine" no longer support the 'heap' value.
 Its supported values now are 'offheap',  'file:\<path\>', 'files:\<path\>'  and 'mmap:\<path\>'
 
 
@@ -2964,12 +2964,12 @@ Removes blanket bypass mechanism (Observer#bypass). Instead, a curated subset of
 The below methods have been marked deprecated in hbase2. We would have liked to have removed them because they use IA.Private parameters but they are in use by CoreCoprocessors or are critical to downstreamers and we have no alternatives to provide currently.
 
 @Deprecated public boolean prePrepareTimeStampForDeleteVersion(final Mutation mutation, final Cell kv, final byte[] byteNow, final Get get) throws IOException {
-              
+
 @Deprecated public boolean preWALRestore(final RegionInfo info, final WALKey logKey, final WALEdit logEdit) throws IOException {
 
 @Deprecated public void postWALRestore(final RegionInfo info, final WALKey logKey, final WALEdit logEdit) throws IOException {
-       
-@Deprecated public DeleteTracker postInstantiateDeleteTracker(DeleteTracker result) throws IOException 
+
+@Deprecated public DeleteTracker postInstantiateDeleteTracker(DeleteTracker result) throws IOException
 
 Metrics are updated now even if the Coprocessor does a bypass; e.g. The put count is updated even if a Coprocessor bypasses the core put operation (We do it this way so no need for Coprocessors to have access to our core metrics system).
 
@@ -3000,7 +3000,7 @@ Made defaults for Server#isStopping and Server#getFileSystem. Should have done t
 * [HBASE-19047](https://issues.apache.org/jira/browse/HBASE-19047) | *Critical* | **CP exposed Scanner types should not extend Shipper**
 
 RegionObserver#preScannerOpen signature changed
-RegionScanner preScannerOpen( ObserverContext\<RegionCoprocessorEnvironment\> c, Scan scan,  RegionScanner s)   -\>   void preScannerOpen( ObserverContext\<RegionCoprocessorEnvironment\> c, Scan scan)  
+RegionScanner preScannerOpen( ObserverContext\<RegionCoprocessorEnvironment\> c, Scan scan,  RegionScanner s)   -\>   void preScannerOpen( ObserverContext\<RegionCoprocessorEnvironment\> c, Scan scan)
 The pre hook can no longer return a RegionScanner instance.
 
 
@@ -3084,12 +3084,12 @@ Add missing deprecation tag for long getRpcTimeout(TimeUnit unit) in AsyncTableB
 
 * [HBASE-18410](https://issues.apache.org/jira/browse/HBASE-18410) | *Major* | **FilterList  Improvement.**
 
-In this task, we fixed all existing bugs in FilterList, and did the code refactor which ensured interface compatibility .  
+In this task, we fixed all existing bugs in FilterList, and did the code refactor which ensured interface compatibility .
 
-The primary bug  fixes are : 
-1. For sub-filter in FilterList with MUST\_PASS\_ONE, if previous filterKeyValue() of sub-filter returns NEXT\_COL, we cannot make sure that the next cell will be the first cell in next column, because FilterList choose the minimal forward step among sub-filters, and it may return a SKIP. so here we add an extra check to ensure that the next cell will match preivous return code for sub-filters. 
+The primary bug  fixes are :
+1. For sub-filter in FilterList with MUST\_PASS\_ONE, if previous filterKeyValue() of sub-filter returns NEXT\_COL, we cannot make sure that the next cell will be the first cell in next column, because FilterList choose the minimal forward step among sub-filters, and it may return a SKIP. so here we add an extra check to ensure that the next cell will match preivous return code for sub-filters.
 2. Previous logic about transforming cell of FilterList is incorrect, we should set the previous transform result (rather than the given cell in question) as the initial vaule of transform cell before call filterKeyValue() of FilterList.
-3. Handle the ReturnCodes which the previous code did not handle. 
+3. Handle the ReturnCodes which the previous code did not handle.
 
 About code refactor, we divided the FilterList into two separated sub-classes: FilterListWithOR and FilterListWithAND,  The FilterListWithOR has been optimised to choose the next minimal step to seek cell rather than SKIP cell one by one, and the FilterListWithAND  has been optimised to choose the next maximal key to seek among sub-filters in filter list. All in all, The code in FilterList is clean and easier to follow now.
 
@@ -3901,7 +3901,7 @@ Changes ObserverContext from a class to an interface and hides away constructor,
 
 * [HBASE-18649](https://issues.apache.org/jira/browse/HBASE-18649) | *Major* | **Deprecate KV Usage in MR to move to Cells in 3.0**
 
-All the mappers and reducers output type will be now of MapReduceCell type. No more KeyValue type. How ever in branch-2 for compatibility we have allowed the older interfaces/classes that work with KeyValue to stay in the code base but they have been marked as deprecated. 
+All the mappers and reducers output type will be now of MapReduceCell type. No more KeyValue type. How ever in branch-2 for compatibility we have allowed the older interfaces/classes that work with KeyValue to stay in the code base but they have been marked as deprecated.
 The following interfaces/classes have been deprecated in branch-2
 Import#KeyValueWritableComparablePartitioner
 Import#KeyValueWritableComparator
@@ -3936,8 +3936,8 @@ The changes of IA.Public/IA.LimitedPrivate classes are shown below:
 HTableDescriptor class
 \* boolean hasRegionMemstoreReplication()
 + boolean hasRegionMemStoreReplication()
-\* HTableDescriptor setRegionMemstoreReplication(boolean) 
-+ HTableDescriptor setRegionMemStoreReplication(boolean) 
+\* HTableDescriptor setRegionMemstoreReplication(boolean)
++ HTableDescriptor setRegionMemStoreReplication(boolean)
 
 RegionLoadStats class
 \* int getMemstoreLoad()
@@ -4013,8 +4013,8 @@ HBaseTestingUtility class
 - void modifyTableSync(Admin admin, HTableDescriptor desc)
 - HRegion createLocalHRegion(HTableDescriptor desc, byte [] startKey, byte [] endKey)
 - HRegion createLocalHRegion(HRegionInfo info, HTableDescriptor desc)
-- HRegion createLocalHRegion(HRegionInfo info, TableDescriptor desc) 
-+ HRegion createLocalHRegion(RegionInfo info, TableDescriptor desc) 
+- HRegion createLocalHRegion(HRegionInfo info, TableDescriptor desc)
++ HRegion createLocalHRegion(RegionInfo info, TableDescriptor desc)
 - HRegion createLocalHRegion(HRegionInfo info, HTableDescriptor desc, WAL wal)
 - HRegion createLocalHRegion(HRegionInfo info, TableDescriptor desc, WAL wal)
 + HRegion createLocalHRegion(RegionInfo info, TableDescriptor desc, WAL wal)
@@ -4121,7 +4121,7 @@ We used to pass the RegionServerServices (RSS) which gave Coprocesosrs (CP) all
 
 Removed method getRegionServerServices from CP exposed RegionCoprocessorEnvironment and RegionServerCoprocessorEnvironment and replaced with getCoprocessorRegionServerServices. This returns a new interface CoprocessorRegionServerServices which is only a subset of RegionServerServices. With that below methods are no longer exposed for CPs
 WAL getWAL(HRegionInfo regionInfo)
-List\<WAL\> getWALs() 
+List\<WAL\> getWALs()
 FlushRequester getFlushRequester()
 RegionServerAccounting getRegionServerAccounting()
 RegionServerRpcQuotaManager getRegionServerRpcQuotaManager()
@@ -4161,8 +4161,8 @@ void addToOnlineRegions(Region region)
 boolean removeFromOnlineRegions(final Region r, ServerName destination)
 
 Also 3 methods name have been changed
-List\<Region\> getOnlineRegions(TableName tableName) -\> List\<Region\> getRegions(TableName tableName) 
-List\<Region\> getOnlineRegions() -\> List\<Region\> getRegions() 
+List\<Region\> getOnlineRegions(TableName tableName) -\> List\<Region\> getRegions(TableName tableName)
+List\<Region\> getOnlineRegions() -\> List\<Region\> getRegions()
 Region getFromOnlineRegions(final String encodedRegionName) -\> Region getRegion(final String encodedRegionName)
 
 
@@ -4225,7 +4225,7 @@ void closeReader(boolean evictOnClose) throws IOException;
 void markCompactedAway();
 void deleteReader() throws IOException;
 
-Notice that these methods are still available in HStoreFile. 
+Notice that these methods are still available in HStoreFile.
 
 And the return value of getFirstKey and getLastKey are changed from Cell to Optional\<Cell\> to better indicate that they may not be available.
 
@@ -4528,7 +4528,7 @@ Replaces hbase-shaded-server-\<version\>.jar with hbase-shaded-mapreduce-\<versi
 
 * [HBASE-15607](https://issues.apache.org/jira/browse/HBASE-15607) | *Blocker* | **Remove PB references from Admin for 2.0**
 
-All the references to Protos in Admin.java have been removed and replaced with respective POJO classes. 
+All the references to Protos in Admin.java have been removed and replaced with respective POJO classes.
 The references to Protos that were removed are
 AdminProtos.GetRegionInfoResponse,
 HBaseProtos.SnapshotDescription, HBaseProtos.SnapshotDescription.Type,
@@ -4656,7 +4656,7 @@ This patch removed the storefile\_index\_size\_MB in protobuf. It will cause the
 * [HBASE-18519](https://issues.apache.org/jira/browse/HBASE-18519) | *Major* | **Use builder pattern to create cell**
 
 Introduce the CellBuilder helper.
-1) Using CellBuilderFactory to get CellBuilder for creating cell with row, 
+1) Using CellBuilderFactory to get CellBuilder for creating cell with row,
     column, qualifier, type, and value.
 2) For internal use, the ExtendedCellBuilder, which is created by ExtendedCellBuilderFactory, is able to build cell with extra fields - sequence id and tags -
 
@@ -4840,7 +4840,7 @@ This patch exposes configuration for Bucketcache. These configs are very similar
 
 * [HBASE-18271](https://issues.apache.org/jira/browse/HBASE-18271) | *Blocker* | **Shade netty**
 
-Depend on hbase-thirdparty for our netty instead of directly relying on netty-all. netty is relocated in hbase-thirdparty from io.netty to org.apache.hadoop.hbase.shaded.io.netty. One kink is that netty bundles an .so. Its files also are relocated. So netty can find the .so content, need to specify on command-line a system property telling netty about the shading. 
+Depend on hbase-thirdparty for our netty instead of directly relying on netty-all. netty is relocated in hbase-thirdparty from io.netty to org.apache.hadoop.hbase.shaded.io.netty. One kink is that netty bundles an .so. Its files also are relocated. So netty can find the .so content, need to specify on command-line a system property telling netty about the shading.
 
 The .so trick is from
              https://stackoverflow.com/questions/33825743/rename-files-inside-a-jar-using-some-maven-plugin
@@ -4877,7 +4877,7 @@ Note that, the constructor way to new a ClusterStatus will be no longer support
 
 * [HBASE-18551](https://issues.apache.org/jira/browse/HBASE-18551) | *Major* | **[AMv2] UnassignProcedure and crashed regionservers**
 
-Unassign will not proceed if it is unable to talk to the remote server. Now it will expire the server it is unable to communicate with and then wait until it is signaled by ServerCrashProcedure that the server's logs have been split. Only then will judge the unassign successful. 
+Unassign will not proceed if it is unable to talk to the remote server. Now it will expire the server it is unable to communicate with and then wait until it is signaled by ServerCrashProcedure that the server's logs have been split. Only then will judge the unassign successful.
 
 We do this because a subsequent assign lacking the crashed server context might open a region w/o first splitting logs.
 
@@ -4948,7 +4948,7 @@ The methods which change to use TableDescriptor/ColumnFamilyDescriptor are shown
 + postCloneSnapshot(ObserverContext\<MasterCoprocessorEnvironment\>,SnapshotDescription,TableDescripto)
 + preRestoreSnapshot(ObserverContext\<MasterCoprocessorEnvironment,SnapshotDescription,TableDescriptor)
 + postRestoreSnapshot(ObserverContext\<MasterCoprocessorEnvironment,SnapshotDescription,TableDescriptor)
-+ preGetTableDescriptors(ObserverContext\<MasterCoprocessorEnvironment\>,List\<TableName\>, List\<TableDescriptor\>,String) 
++ preGetTableDescriptors(ObserverContext\<MasterCoprocessorEnvironment\>,List\<TableName\>, List\<TableDescriptor\>,String)
 + postGetTableDescriptors(ObserverContext\<MasterCoprocessorEnvironment\>,List\<TableName\>, List\<TableDescriptor\>,String)
 + preGetTableNames(ObserverContext\<MasterCoprocessorEnvironment\>,List\<TableDescriptor\>, String)
 + postGetTableNames(ObserverContext\<MasterCoprocessorEnvironment\>,List\<TableDescriptor\>, String)
@@ -5063,11 +5063,11 @@ Committed to master and branch-2. Thanks!
 
 In order to use this feature, a user must 

 1. Register their tables when configuring their job
-
2. Create a composite key of the tablename and original rowkey to send as the mapper output key. 
+
2. Create a composite key of the tablename and original rowkey to send as the mapper output key.
 
 

To register their tables (and configure their job for incremental load into multiple tables), a user must call the static MultiHFileOutputFormat.configureIncrementalLoad function to register the HBase tables that will be ingested into. 


 
-To create the composite key, a helper function MultiHFileOutputFormat2.createCompositeKey should be called with the destination tablename and rowkey as arguments, and the result should be output as the mapper key. 
+To create the composite key, a helper function MultiHFileOutputFormat2.createCompositeKey should be called with the destination tablename and rowkey as arguments, and the result should be output as the mapper key.
 
 
Before this JIRA, for HFileOutputFormat2 a configuration for the storage policy was set per Column Family. This was set manually by the user. In this JIRA, this is unchanged when using HFileOutputFormat2. However, when specifically using MultiHFileOutputFormat2, the user now has to manually set the prefix by creating a composite of the table name and the column family. The user can create the new composite value by calling MultiHFileOutputFormat2.createCompositeKey with the tablename and  [...]
 
@@ -5080,9 +5080,9 @@ The configuration parameter "hbase.mapreduce.hfileoutputformat.table.name" is no
 
 * [HBASE-18229](https://issues.apache.org/jira/browse/HBASE-18229) | *Critical* | **create new Async Split API to embrace AM v2**
 
-A new splitRegionAsync() API is added in client. The existing splitRegion()  and split() API will call the new API so client does not have to change its code. 
+A new splitRegionAsync() API is added in client. The existing splitRegion()  and split() API will call the new API so client does not have to change its code.
 
-Move HBaseAdmin.splitXXX() logic to master, client splitXXX() API now go to master directly instead of going to RegionServer first.  
+Move HBaseAdmin.splitXXX() logic to master, client splitXXX() API now go to master directly instead of going to RegionServer first.
 
 Also added splitSync() API
 
@@ -5236,7 +5236,7 @@ Add unit tests for truncate\_preserve
 
 * [HBASE-18240](https://issues.apache.org/jira/browse/HBASE-18240) | *Major* | **Add hbase-thirdparty, a project with hbase utility including an hbase-shaded-thirdparty module with guava, netty, etc.**
 
-Adds a new project, hbase-thirdparty, at https://git-wip-us.apache.org/repos/asf/hbase-thirdparty used by core hbase. GroupID org.apache.hbase.thirdparty. Version 1.0.0. 
+Adds a new project, hbase-thirdparty, at https://git-wip-us.apache.org/repos/asf/hbase-thirdparty used by core hbase. GroupID org.apache.hbase.thirdparty. Version 1.0.0.
 
 This project packages relocated third-party libraries used by Apache HBase such as protobuf, guava, and netty among others. HBase core depends on it.
 
@@ -5275,9 +5275,9 @@ After HBASE-17110 the bytable strategy for SimpleLoadBalancer will also take ser
 Adds clear\_compaction\_queues to the hbase shell.
 {code}
   Clear compaction queues on a regionserver.
-  The queue\_name contains short and long. 
+  The queue\_name contains short and long.
   short is shortCompactions's queue,long is longCompactions's queue.
-  
+
   Examples:
   hbase\> clear\_compaction\_queues 'host187.example.com,60020'
   hbase\> clear\_compaction\_queues 'host187.example.com,60020','long'
@@ -5367,8 +5367,8 @@ Adds a sort of procedures before submission so system tables are queued first (w
 
 * [HBASE-18008](https://issues.apache.org/jira/browse/HBASE-18008) | *Major* | **Any HColumnDescriptor we give out should be immutable**
 
-1) The HColumnDescriptor got from Admin, AsyncAdmin, and Table is immutable. 
-2) HColumnDescriptor have been marked as "Deprecated" and user should substituted  
+1) The HColumnDescriptor got from Admin, AsyncAdmin, and Table is immutable.
+2) HColumnDescriptor have been marked as "Deprecated" and user should substituted
      ColumnFamilyDescriptor for HColumnDescriptor.
 3) ColumnFamilyDescriptor is constructed through ColumnFamilyDescriptorBuilder and it contains all of the read-only methods from HColumnDescriptor
 4) The value to which the IS\_MOB/MOB\_THRESHOLD is mapped is stored as String rather than Boolean/Long. The MOB is an new feature to 2.0 so this change should be acceptable
@@ -5551,7 +5551,7 @@ The default behavior for abort() method of StateMachineProcedure class is change
 
 * [HBASE-16851](https://issues.apache.org/jira/browse/HBASE-16851) | *Major* | **User-facing documentation for the In-Memory Compaction feature**
 
-Two blog posts on Apache HBase blog: user manual and programmer manual. 
+Two blog posts on Apache HBase blog: user manual and programmer manual.
 Ref. guide draft published: https://docs.google.com/document/d/1Xi1jh\_30NKnjE3wSR-XF5JQixtyT6H\_CdFTaVi78LKw/edit
 
 
@@ -5564,18 +5564,18 @@ Ref. guide draft published: https://docs.google.com/document/d/1Xi1jh\_30NKnjE3w
 CompactingMemStore achieves these gains through smart use of RAM. The algorithm periodically re-organizes the in-memory data in efficient data structures and reduces redundancies. The  HBase server’s memory footprint therefore periodically expands and contracts. The outcome is longer lifetime of data in memory, less I/O, and overall faster performance. More details about the algorithm and its use appear in the Apache HBase Blog: https://blogs.apache.org/hbase/
 
 How To Use:
-The in-memory compaction level can be configured both globally and per column family. The supported levels are none (DefaultMemStore), basic, and eager. 
+The in-memory compaction level can be configured both globally and per column family. The supported levels are none (DefaultMemStore), basic, and eager.
 
-By default, all tables apply basic in-memory compaction. This global configuration can be overridden in hbase-site.xml, as follows: 
+By default, all tables apply basic in-memory compaction. This global configuration can be overridden in hbase-site.xml, as follows:
 
 \<property\>
  \<name\>hbase.hregion.compacting.memstore.type\</name\>
  \<value\>\<none\|basic\|eager\>\</value\>
  \</property\>
 
-The level can also be configured in the HBase shell per column family, as follows:  
+The level can also be configured in the HBase shell per column family, as follows:
 
-create ‘\<tablename\>’, 
+create ‘\<tablename\>’,
 {NAME =\> ‘\<cfname\>’, IN\_MEMORY\_COMPACTION =\> ‘\<NONE\|BASIC\|EAGER\>’}
 
 
@@ -5656,7 +5656,7 @@ MVCCPreAssign is added by HBASE-16698, but pre-assign mvcc is only used in put/d
 
 * [HBASE-16466](https://issues.apache.org/jira/browse/HBASE-16466) | *Major* | **HBase snapshots support in VerifyReplication tool to reduce load on live HBase cluster with large tables**
 
-Support for snapshots in VerifyReplication tool i.e. verifyrep can compare source table snapshot against peer table snapshot which reduces load on RS by reading data from HDFS directly using Snapshot scanners. 
+Support for snapshots in VerifyReplication tool i.e. verifyrep can compare source table snapshot against peer table snapshot which reduces load on RS by reading data from HDFS directly using Snapshot scanners.
 Instead of comparing against live tables whose state changes due to writes and compactions its better to compare HBase  snapshots which are immutable in nature.
 
 
@@ -5827,7 +5827,7 @@ Now small scan and limited scan could also return partial results.
 * [HBASE-16014](https://issues.apache.org/jira/browse/HBASE-16014) | *Major* | **Get and Put constructor argument lists are divergent**
 
 Add 2 constructors fot API Get
-1. Get(byte[], int, int) 
+1. Get(byte[], int, int)
 2. Get(ByteBuffer)
 
 
@@ -5986,7 +5986,7 @@ Changes all tests to use the TestName JUnit Rule everywhere rather than hardcode
 
 The HBase cleaner chore process cleans up old WAL files and archived HFiles. Cleaner operation can affect query performance when running heavy workloads, so disable the cleaner during peak hours. The cleaner has the following HBase shell commands:
 
-- cleaner\_chore\_enabled: Queries whether cleaner chore is enabled/ disabled. 
+- cleaner\_chore\_enabled: Queries whether cleaner chore is enabled/ disabled.
 - cleaner\_chore\_run: Manually runs the cleaner to remove files.
 - cleaner\_chore\_switch: enables or disables the cleaner and returns the previous state of the cleaner. For example, cleaner-switch true enables the cleaner.
 
@@ -6049,8 +6049,8 @@ Now the scan.setSmall method is deprecated. Consider using scan.setLimit and sca
 
 Mob compaction partition policy can be set by
 hbase\> create 't1', {NAME =\> 'f1', IS\_MOB =\> true, MOB\_THRESHOLD =\> 1000000, MOB\_COMPACT\_PARTITION\_POLICY =\> 'weekly'}
- 
-or 
+
+or
 
 hbase\> alter 't1', {NAME =\> 'f1', IS\_MOB =\> true, MOB\_THRESHOLD =\> 1000000, MOB\_COMPACT\_PARTITION\_POLICY =\> 'monthly'}
 
@@ -6093,16 +6093,16 @@ Fix inability at finding static content post push of parent issue moving us to j
 
 * [HBASE-9774](https://issues.apache.org/jira/browse/HBASE-9774) | *Major* | **HBase native metrics and metric collection for coprocessors**
 
-This issue adds two new modules, hbase-metrics and hbase-metrics-api which define and implement the "new" metric system used internally within HBase. These two modules (and some other code in hbase-hadoop2-compat) module are referred as "HBase metrics framework" which is HBase-specific and independent of any other metrics library (including Hadoop metrics2 and dropwizards metrics). 
+This issue adds two new modules, hbase-metrics and hbase-metrics-api which define and implement the "new" metric system used internally within HBase. These two modules (and some other code in hbase-hadoop2-compat) module are referred as "HBase metrics framework" which is HBase-specific and independent of any other metrics library (including Hadoop metrics2 and dropwizards metrics).
 
 HBase Metrics API (hbase-metrics-api) contains the interface that HBase exposes internally and to third party code (including coprocessors). It is a thin
-abstraction over the actual implementation for backwards compatibility guarantees. The metrics API in this hbase-metrics-api module is inspired by the Dropwizard metrics 3.1 API, however, the API is completely independent. 
+abstraction over the actual implementation for backwards compatibility guarantees. The metrics API in this hbase-metrics-api module is inspired by the Dropwizard metrics 3.1 API, however, the API is completely independent.
 
-hbase-metrics module contains implementation of the "HBase Metrics API", including MetricRegistry, Counter, Histogram, etc. These are highly concurrent implementations of the Metric interfaces. Metrics in HBase are grouped into different sets (like WAL, RPC, RegionServer, etc). Each group of metrics should be tracked via a MetricRegistry specific to that group. 
+hbase-metrics module contains implementation of the "HBase Metrics API", including MetricRegistry, Counter, Histogram, etc. These are highly concurrent implementations of the Metric interfaces. Metrics in HBase are grouped into different sets (like WAL, RPC, RegionServer, etc). Each group of metrics should be tracked via a MetricRegistry specific to that group.
 
 Historically, HBase has been using Hadoop's Metrics2 framework [3] for collecting and reporting the metrics internally. However, due to the difficultly of dealing with the Metrics2 framework, HBase is moving away from Hadoop's metrics implementation to its custom implementation. The move will happen incrementally, and during the time, both Hadoop Metrics2-based metrics and hbase-metrics module based classes will be in the source code. All new implementations for metrics SHOULD use the ne [...]
 
-This jira also introduces the metrics API to coprocessor implementations. Coprocessor writes can export custom metrics using the API and have those collected via metrics2 sinks, as well as exported via JMX in regionserver metrics. 
+This jira also introduces the metrics API to coprocessor implementations. Coprocessor writes can export custom metrics using the API and have those collected via metrics2 sinks, as well as exported via JMX in regionserver metrics.
 
 More documentation available at: hbase-metrics-api/README.txt
 
@@ -6166,7 +6166,7 @@ Move locking to be procedure (Pv2) rather than zookeeper based. All locking move
 
 * [HBASE-17470](https://issues.apache.org/jira/browse/HBASE-17470) | *Major* | **Remove merge region code from region server**
 
-In 1.x branches, Admin.mergeRegions calls MASTER via dispatchMergingRegions RPC; when executing dispatchMergingRegions RPC, MASTER calls RS via MergeRegions to complete the merge in RS-side.  
+In 1.x branches, Admin.mergeRegions calls MASTER via dispatchMergingRegions RPC; when executing dispatchMergingRegions RPC, MASTER calls RS via MergeRegions to complete the merge in RS-side.
 
 With HBASE-16119, the merge logic moves to master-side.  This JIRA cleans up unused RPCs (dispatchMergingRegions and MergeRegions) , removes dangerous tools such as Merge and HMerge, and deletes unused RegionServer-side merge region logic in 2.0 release.
 
@@ -6336,7 +6336,7 @@ Possible memstore compaction policies are:
 Memory compaction policeman be set at the column family level at table creation time:
 {code}
 create ‘\<tablename\>’,
-   {NAME =\> ‘\<cfname\>’, 
+   {NAME =\> ‘\<cfname\>’,
     IN\_MEMORY\_COMPACTION =\> ‘\<NONE\|BASIC\|EAGER\>’}
 {code}
 or as a property at the global configuration level by setting the property in hbase-site.xml, with BASIC being the default value:
@@ -6374,7 +6374,7 @@ Provides ability to restrict table coprocessors based on HDFS path whitelist. (P
 
 * [HBASE-17221](https://issues.apache.org/jira/browse/HBASE-17221) | *Major* | **Abstract out an interface for RpcServer.Call**
 
-Provide an interface RpcCall on the server side. 
+Provide an interface RpcCall on the server side.
 RpcServer.Call now is marked as @InterfaceAudience.Private, and implements the interface RpcCall,
 
 
@@ -6682,7 +6682,7 @@ Add AsyncConnection, AsyncTable and AsyncTableRegionLocator. Now the AsyncTable
 
 This issue fix three bugs:
 1.  rpcTimeout configuration not work for one rpc call in AP
-2.  operationTimeout configuration not work for multi-request (batch, put) in AP 
+2.  operationTimeout configuration not work for multi-request (batch, put) in AP
 3.  setRpcTimeout and setOperationTimeout in HTable is not worked for AP and BufferedMutator.
 
 
@@ -6712,7 +6712,7 @@ exist in a cleanly closed file.
 If an EOF is detected due to parsing or other errors while there are still unparsed bytes before the end-of-file trailer, we now reset the WAL to the very beginning and attempt a clean read-through. Because we will retry these failures indefinitely, two additional changes are made to help with diagnostics:
 
 \* On each retry attempt, a log message like the below will be emitted at the WARN level:
-    
+
       Processing end of WAL file '{}'. At position {}, which is too far away
       from reported file length {}. Restarting WAL reading (see HBASE-15983
       for details).
@@ -7035,7 +7035,7 @@ Adds logging of region and server. Helpful debugging. Logging now looks like thi
 
 * [HBASE-14743](https://issues.apache.org/jira/browse/HBASE-14743) | *Minor* | **Add metrics around HeapMemoryManager**
 
-A memory metrics reveals situations happened in both MemStores and BlockCache in RegionServer. Through this metrics, users/operators can know 
+A memory metrics reveals situations happened in both MemStores and BlockCache in RegionServer. Through this metrics, users/operators can know
 1). Current size of MemStores and BlockCache in bytes.
 2). Occurrence for Memstore minor and major flush. (named unblocked flush and blocked flush respectively, shown in histogram)
 3). Dynamic changes in size between MemStores and BlockCache. (with Increase/Decrease as prefix, shown in histogram). And a counter for no changes, named DoNothingCounter.
@@ -7062,7 +7062,7 @@ When LocalHBaseCluster is started from the command line the Master would give up
 
 * [HBASE-16052](https://issues.apache.org/jira/browse/HBASE-16052) | *Major* | **Improve HBaseFsck Scalability**
 
-HBASE-16052 improves the performance and scalability of HBaseFsck, especially for large clusters with a small number of large tables.  
+HBASE-16052 improves the performance and scalability of HBaseFsck, especially for large clusters with a small number of large tables.
 
 Searching for lingering reference files is now a multi-threaded operation.  Loading HDFS region directory information is now multi-threaded at the region-level instead of the table-level to maximize concurrency.  A performance bug in HBaseFsck that resulted in redundant I/O and RPCs was fixed by introducing a FileStatusFilter that filters FileStatus objects directly.
 
@@ -7078,7 +7078,7 @@ If zk based replication queue is used and useMulti is false, we will schedule a
 
 * [HBASE-3727](https://issues.apache.org/jira/browse/HBASE-3727) | *Minor* | **MultiHFileOutputFormat**
 
-MultiHFileOutputFormat support output of HFiles from multiple tables. It will output directories and hfiles as follow, 
+MultiHFileOutputFormat support output of HFiles from multiple tables. It will output directories and hfiles as follow,
      --table1
        --family1
        --family2
@@ -7102,7 +7102,7 @@ Prior to this change, the integration test clients (IntegrationTest\*) relied on
 
 * [HBASE-13823](https://issues.apache.org/jira/browse/HBASE-13823) | *Major* | **Procedure V2: unnecessaery operations on AssignmentManager#recoverTableInDisablingState() and recoverTableInEnablingState()**
 
-For cluster upgraded from 1.0.x or older releases, master startup would not continue the in-progress enable/disable table process.  If orphaned znode with ENABLING/DISABLING state exists in the cluster, run hbck or manually fix the issue.  
+For cluster upgraded from 1.0.x or older releases, master startup would not continue the in-progress enable/disable table process.  If orphaned znode with ENABLING/DISABLING state exists in the cluster, run hbck or manually fix the issue.
 
 For new cluster or cluster upgraded from 1.1.x and newer release, there is no issue to worry about.
 
@@ -7111,9 +7111,9 @@ For new cluster or cluster upgraded from 1.1.x and newer release, there is no is
 
 * [HBASE-16095](https://issues.apache.org/jira/browse/HBASE-16095) | *Major* | **Add priority to TableDescriptor and priority region open thread pool**
 
-Adds a PRIORITY property to the HTableDescriptor. PRIORITY should be in the same range as the RpcScheduler defines it (HConstants.XXX\_QOS). 
+Adds a PRIORITY property to the HTableDescriptor. PRIORITY should be in the same range as the RpcScheduler defines it (HConstants.XXX\_QOS).
 
-Table priorities are only used for region opening for now. There can be other uses later (like RpcScheduling). 
+Table priorities are only used for region opening for now. There can be other uses later (like RpcScheduling).
 
 Regions of high priority tables (priority \>= than HIGH\_QOS) are opened from a different thread pool than the regular region open thread pool. However, table priorities are not used as a global order for region assigning or opening.
 
@@ -7129,7 +7129,7 @@ When a replication endpoint is sent a shutdown request by the replication source
 
 * [HBASE-16087](https://issues.apache.org/jira/browse/HBASE-16087) | *Major* | **Replication shouldn't start on a master if if only hosts system tables**
 
-Masters will no longer start any replication threads if they are hosting only system tables. 
+Masters will no longer start any replication threads if they are hosting only system tables.
 
 In order to change this add something to the config for tables on master that doesn't start with "hbase:" ( Replicating system tables is something that's currently unsupported and can open up security holes, so do this at your own peril)
 
@@ -7138,7 +7138,7 @@ In order to change this add something to the config for tables on master that do
 
 * [HBASE-14548](https://issues.apache.org/jira/browse/HBASE-14548) | *Major* | **Expand how table coprocessor jar and dependency path can be specified**
 
-Allow a directory containing the jars or some wildcards to be specified, such as: hdfs://namenode:port/user/hadoop-user/ 
+Allow a directory containing the jars or some wildcards to be specified, such as: hdfs://namenode:port/user/hadoop-user/
 or
 hdfs://namenode:port/user/hadoop-user/\*.jar
 
@@ -7185,12 +7185,12 @@ This patch introduces a new infrastructure for creation and maintenance of Maven
 
 NOTE that this patch should introduce two new WARNINGs ("Using platform encoding ... to copy filtered resources") into the hbase install process. These warnings are hard-wired into the maven-archetype-plugin:create-from-project goal. See hbase/hbase-archetypes/README.md, footnote [6] for details.
 
-After applying the patch, see hbase/hbase-archetypes/README.md for details regarding the new archetype infrastructure introduced by this patch. (The README text is also conveniently positioned at the top of the patch itself.) 
+After applying the patch, see hbase/hbase-archetypes/README.md for details regarding the new archetype infrastructure introduced by this patch. (The README text is also conveniently positioned at the top of the patch itself.)
 
-Here is the opening paragraph of the README.md file: 
-================= 
-The hbase-archetypes subproject of hbase provides an infrastructure for creation and maintenance of Maven archetypes pertinent to HBase. Upon deployment to the archetype catalog of the central Maven repository, these archetypes may be used by end-user developers to autogenerate completely configured Maven projects (including fully-functioning sample code) through invocation of the archetype:generate goal of the maven-archetype-plugin. 
-======== 
+Here is the opening paragraph of the README.md file:
+=================
+The hbase-archetypes subproject of hbase provides an infrastructure for creation and maintenance of Maven archetypes pertinent to HBase. Upon deployment to the archetype catalog of the central Maven repository, these archetypes may be used by end-user developers to autogenerate completely configured Maven projects (including fully-functioning sample code) through invocation of the archetype:generate goal of the maven-archetype-plugin.
+========
 The README.md file also contains several paragraphs under the heading, "Notes for contributors and committers to the HBase project", which explains the layout of 'hbase-archetypes', and how archetypes are created and installed into the local Maven repository, ready for deployment to the central Maven repository. It also outlines how new archetypes may be developed and added to the collection in the future.
 
 
@@ -7249,7 +7249,7 @@ Adds a FifoRpcSchedulerFactory so you can try the FifoRpcScheduler by setting  "
 
 * [HBASE-15989](https://issues.apache.org/jira/browse/HBASE-15989) | *Major* | **Remove hbase.online.schema.update.enable**
 
-Removes the "hbase.online.schema.update.enable" property. 
+Removes the "hbase.online.schema.update.enable" property.
 from now, every operation that alter the schema (e.g. modifyTable, addFamily, removeFamily, ...) will use the online schema update. there is no need to disable/enable the table.
 
 
@@ -7318,12 +7318,12 @@ See http://mail-archives.apache.org/mod\_mbox/hbase-dev/201605.mbox/%3CCAMUu0w-Z
 
 * [HBASE-15228](https://issues.apache.org/jira/browse/HBASE-15228) | *Major* | **Add the methods to RegionObserver to trigger start/complete restoring WALs**
 
-Added two hooks around WAL restore. 
+Added two hooks around WAL restore.
 preReplayWALs(final ObserverContext\<? extends RegionCoprocessorEnvironment\> ctx,  HRegionInfo info, Path edits)
 and
-postReplayWALs(final ObserverContext\<? extends RegionCoprocessorEnvironment\> ctx,  HRegionInfo info, Path edits) 
+postReplayWALs(final ObserverContext\<? extends RegionCoprocessorEnvironment\> ctx,  HRegionInfo info, Path edits)
 
-Will be called at start and end of restore of a WAL file. 
+Will be called at start and end of restore of a WAL file.
 The other hook around WAL restore (preWALRestore ) will be called before restore of every entry within the WAL file.
 
 
@@ -7565,12 +7565,12 @@ No functional change. Added javadoc, comments, and extra trace-level logging to
 
 Use 'hbase.hstore.compaction.date.tiered.window.factory.class' to specify the window implementation you like for date tiered compaction. Now the only and default implementation is org.apache.hadoop.hbase.regionserver.compactions.ExponentialCompactionWindowFactory.
 
-{code} 
-\<property\> 
-\<name\>hbase.hstore.compaction.date.tiered.window.factory.class\</name\> 
-\<value\>org.apache.hadoop.hbase.regionserver.compactions.ExponentialCompactionWindowFactory\</value\> 
-\</property\> 
-\<property\> 
+{code}
+\<property\>
+\<name\>hbase.hstore.compaction.date.tiered.window.factory.class\</name\>
+\<value\>org.apache.hadoop.hbase.regionserver.compactions.ExponentialCompactionWindowFactory\</value\>
+\</property\>
+\<property\>
 {code}
 
 
@@ -7669,15 +7669,15 @@ With this patch combined with HBASE-15389, when we compact, we can output multip
 2. Bulk load files and the old file generated by major compaction before upgrading to DTCP.
 
 This will change the way to enable date tiered compaction.
-To turn it on: 
+To turn it on:
 hbase.hstore.engine.class: org.apache.hadoop.hbase.regionserver.DateTieredStoreEngine
 
-With tiered compaction all servers in the cluster will promote windows to higher tier at the same time, so using a compaction throttle is recommended: 
-hbase.regionserver.throughput.controller:org.apache.hadoop.hbase.regionserver.compactions.PressureAwareCompactionThroughputController 
+With tiered compaction all servers in the cluster will promote windows to higher tier at the same time, so using a compaction throttle is recommended:
+hbase.regionserver.throughput.controller:org.apache.hadoop.hbase.regionserver.compactions.PressureAwareCompactionThroughputController
 hbase.hstore.compaction.throughput.higher.bound and hbase.hstore.compaction.throughput.lower.bound need to be set for desired throughput range as uncompressed rates.
 
-Because there will most likely be more store files around, we need to adjust the configuration so that flush won't be blocked and compaction will be properly throttled: 
-hbase.hstore.blockingStoreFiles: change to 50 if using all default parameters when turning on date tiered compaction. Use 1.5~2 x projected file count if changing the parameters, Projected file count = windows per tier x tier count + incoming window min + files older than max age 
+Because there will most likely be more store files around, we need to adjust the configuration so that flush won't be blocked and compaction will be properly throttled:
+hbase.hstore.blockingStoreFiles: change to 50 if using all default parameters when turning on date tiered compaction. Use 1.5~2 x projected file count if changing the parameters, Projected file count = windows per tier x tier count + incoming window min + files older than max age
 
 Because major compaction is turned on now, we also need to adjust the configuration for max file to compact according to the larger file count:
 hbase.hstore.compaction.max: set to the same number as hbase.hstore.blockingStoreFiles.
@@ -7774,7 +7774,7 @@ Adds a configuration parameter "hbase.ipc.max.request.size" which defaults to 25
 
 * [HBASE-15412](https://issues.apache.org/jira/browse/HBASE-15412) | *Major* | **Add average region size metric**
 
-Adds a new metric for called "averageRegionSize" that is emitted as a regionserver metric. Metric description: 
+Adds a new metric for called "averageRegionSize" that is emitted as a regionserver metric. Metric description:
 Average region size over the region server including memstore and storefile sizes
 
 
@@ -7817,7 +7817,7 @@ Fixed an issue in REST server checkAndDelete operation where the remaining cells
 
 * [HBASE-15377](https://issues.apache.org/jira/browse/HBASE-15377) | *Major* | **Per-RS Get metric is time based, per-region metric is size-based**
 
-Per-region metrics related to Get histograms are changed from being response size based into being latency based similar to the per-regionserver metrics of the same name.  
+Per-region metrics related to Get histograms are changed from being response size based into being latency based similar to the per-regionserver metrics of the same name.
 
 Added GetSize histogram metrics at the per-regionserver and per-region level for the response sizes.
 
@@ -7826,9 +7826,9 @@ Added GetSize histogram metrics at the per-regionserver and per-region level for
 
 * [HBASE-6721](https://issues.apache.org/jira/browse/HBASE-6721) | *Major* | **RegionServer Group based Assignment**
 
-[ADVANCED USERS ONLY] This patch adds a new experimental module hbase-rsgroup. It is an advanced feature for partitioning regionservers into distinctive groups for strict isolation, and should only be used by users who are sophisticated enough to understand the full implications and have a sufficient background in managing HBase clusters. 
+[ADVANCED USERS ONLY] This patch adds a new experimental module hbase-rsgroup. It is an advanced feature for partitioning regionservers into distinctive groups for strict isolation, and should only be used by users who are sophisticated enough to understand the full implications and have a sufficient background in managing HBase clusters.
 
-RSGroups can be defined and managed with shell commands or corresponding Java APIs. A server can be added to a group with hostname and port pair, and tables can be moved to this group so that only regionservers in the same rsgroup can host the regions of the table. RegionServers and tables can only belong to 1 group at a time. By default, all tables and regionservers belong to the "default" group. System tables can also be put into a group using the regular APIs. A custom balancer implem [...]
+RSGroups can be defined and managed with shell commands or corresponding Java APIs. A server can be added to a group with hostname and port pair, and tables can be moved to this group so that only regionservers in the same rsgroup can host the regions of the table. RegionServers and tables can only belong to 1 group at a time. By default, all tables and regionservers belong to the "default" group. System tables can also be put into a group using the regular APIs. A custom balancer implem [...]
 
 To enable, add the following to your hbase-site.xml and restart your Master:
 
@@ -7857,7 +7857,7 @@ This adds a group to the 'hbase:rsgroup' system table. Add a server (hostname +
 
 * [HBASE-15435](https://issues.apache.org/jira/browse/HBASE-15435) | *Major* | **Add WAL (in bytes) written metric**
 
-Adds a new metric named "writtenBytes" as a per-regionserver metric. Metric Description: 
+Adds a new metric named "writtenBytes" as a per-regionserver metric. Metric Description:
 Size (in bytes) of the data written to the WAL.
 
 
@@ -7908,7 +7908,7 @@ on branch-1, branch-1.2 and branch 1.3 we now check if the exception is meta-cle
 
 * [HBASE-15376](https://issues.apache.org/jira/browse/HBASE-15376) | *Major* | **ScanNext metric is size-based while every other per-operation metric is time based**
 
-Removed ScanNext histogram metrics as regionserver level and per-region level metrics since the semantics is not compatible with other similar metrics (size histogram vs latency histogram). 
+Removed ScanNext histogram metrics as regionserver level and per-region level metrics since the semantics is not compatible with other similar metrics (size histogram vs latency histogram).
 
 Instead, this patch adds ScanTime and ScanSize histogram metrics at the regionserver and per-region level.
 
@@ -7931,7 +7931,7 @@ Previously RPC request scheduler in HBase had 2 modes in could operate in:
 
 This patch adds new type of scheduler to HBase, based on the research around controlled delay (CoDel) algorithm [1], used in networking to combat bufferbloat, as well as some analysis on generalizing it to generic request queues [2]. The purpose of that work is to prevent long standing call queues caused by discrepancy between request rate and available throughput, caused by kernel/disk IO/networking stalls.
 
-New RPC scheduler could be enabled by setting hbase.ipc.server.callqueue.type=codel in configuration. Several additional params allow to configure algorithm behavior - 
+New RPC scheduler could be enabled by setting hbase.ipc.server.callqueue.type=codel in configuration. Several additional params allow to configure algorithm behavior -
 
 hbase.ipc.server.callqueue.codel.target.delay
 hbase.ipc.server.callqueue.codel.interval
@@ -8105,7 +8105,7 @@ Removed IncrementPerformanceTest. It is not as configurable as the additions mad
 
 * [HBASE-15218](https://issues.apache.org/jira/browse/HBASE-15218) | *Blocker* | **On RS crash and replay of WAL, loosing all Tags in Cells**
 
-This issue fixes 
+This issue fixes
 - In case of normal WAL (Not encrypted) we were loosing all cell tags on WAL replay after an RS crash
 - In case of encrypted WAL we were not even persisting Cell tags in WAL.  Tags from all unflushed (to HFile) Cells will get lost even after WAL replay recovery is done.
 
@@ -8154,13 +8154,13 @@ If you are using co processors and refer the Cells in the read results, DO NOT s
 
 * [HBASE-15145](https://issues.apache.org/jira/browse/HBASE-15145) | *Major* | **HBCK and Replication should authenticate to zookepeer using server principal**
 
-Added a new command line argument: --auth-as-server to enable authenticating to ZooKeeper as the HBase Server principal. This is required for secure clusters for doing replication operations like add\_peer, list\_peers, etc until HBASE-11392 is fixed. This advanced option can also be used for manually fixing secure znodes. 
+Added a new command line argument: --auth-as-server to enable authenticating to ZooKeeper as the HBase Server principal. This is required for secure clusters for doing replication operations like add\_peer, list\_peers, etc until HBASE-11392 is fixed. This advanced option can also be used for manually fixing secure znodes.
 
-Commands can now be invoked like: 
-hbase --auth-as-server shell 
-hbase --auth-as-server zkcli 
+Commands can now be invoked like:
+hbase --auth-as-server shell
+hbase --auth-as-server zkcli
 
-HBCK in secure setup also needs to authenticate to ZK using servers principals.This is turned on by default (no need to pass additional argument). 
+HBCK in secure setup also needs to authenticate to ZK using servers principals.This is turned on by default (no need to pass additional argument).
 
 When authenticating as server, HBASE\_SERVER\_JAAS\_OPTS is concatenated to HBASE\_OPTS if defined in hbase-env.sh. Otherwise, HBASE\_REGIONSERVER\_OPTS is concatenated.
 
@@ -8209,7 +8209,7 @@ The \`hbase version\` command now outputs directly to stdout rather than to a lo
 * [HBASE-15027](https://issues.apache.org/jira/browse/HBASE-15027) | *Major* | **Refactor the way the CompactedHFileDischarger threads are created**
 
 The property 'hbase.hfile.compactions.discharger.interval' has been renamed to 'hbase.hfile.compaction.discharger.interval' that describes the interval after which the compaction discharger chore service should run.
-The property 'hbase.hfile.compaction.discharger.thread.count' describes the thread count that does the compaction discharge work. 
+The property 'hbase.hfile.compaction.discharger.thread.count' describes the thread count that does the compaction discharge work.
 The CompactedHFilesDischarger is a chore service now started as part of the RegionServer and this chore service iterates over all the onlineRegions in that RS and uses the RegionServer's executor service to launch a set of threads that does this job of compaction files clean up.
 
 
@@ -8217,8 +8217,8 @@ The CompactedHFilesDischarger is a chore service now started as part of the Regi
 
 * [HBASE-14468](https://issues.apache.org/jira/browse/HBASE-14468) | *Major* | **Compaction improvements: FIFO compaction policy**
 
-FIFO compaction policy selects only files which have all cells expired. The column family MUST have non-default TTL. 
-Essentially, FIFO compactor does only one job: collects expired store files. 
+FIFO compaction policy selects only files which have all cells expired. The column family MUST have non-default TTL.
+Essentially, FIFO compactor does only one job: collects expired store files.
 
 Because we do not do any real compaction, we do not use CPU and IO (disk and network), we do not evict hot data from a block cache. The result: improved throughput and latency both write and read.
 See: https://github.com/facebook/rocksdb/wiki/FIFO-compaction-style
@@ -8281,7 +8281,7 @@ All clients before 1.2.0 will not get this multi request chunking based upon blo
 
 * [HBASE-14951](https://issues.apache.org/jira/browse/HBASE-14951) | *Minor* | **Make hbase.regionserver.maxlogs obsolete**
 
-Rolling WAL events across a cluster can be highly correlated, hence flushing memstores, hence triggering minor compactions, that can be promoted to major ones. These events are highly correlated in time if there is a balanced write-load on the regions in a table. Default value for maximum WAL files (\* hbase.regionserver.maxlogs\*), which controls WAL rolling events - 32 is too small for many modern deployments. 
+Rolling WAL events across a cluster can be highly correlated, hence flushing memstores, hence triggering minor compactions, that can be promoted to major ones. These events are highly correlated in time if there is a balanced write-load on the regions in a table. Default value for maximum WAL files (\* hbase.regionserver.maxlogs\*), which controls WAL rolling events - 32 is too small for many modern deployments.
 Now we calculate this value dynamically (if not defined by user), using the following formula:
 
 maxLogs = Math.max( 32, HBASE\_HEAP\_SIZE \* memstoreRatio \* 2/ LogRollSize), where
@@ -8289,7 +8289,7 @@ maxLogs = Math.max( 32, HBASE\_HEAP\_SIZE \* memstoreRatio \* 2/ LogRollSize), w
 memstoreRatio is \*hbase.regionserver.global.memstore.size\*
 LogRollSize is maximum WAL file size (default 0.95 \* HDFS block size)
 
-We need to make sure that we avoid fully or minimize events when RS has to flush memstores prematurely only because it reached artificial limit of hbase.regionserver.maxlogs, this is why we put this 2 x multiplier in equation, this gives us maximum WAL capacity of 2 x RS memstore-size. 
+We need to make sure that we avoid fully or minimize events when RS has to flush memstores prematurely only because it reached artificial limit of hbase.regionserver.maxlogs, this is why we put this 2 x multiplier in equation, this gives us maximum WAL capacity of 2 x RS memstore-size.
 
 Runaway WAL files.
 
@@ -8321,7 +8321,7 @@ Setting it to false ( the default ) will help ensure a more even distribution of
 
 * [HBASE-14534](https://issues.apache.org/jira/browse/HBASE-14534) | *Minor* | **Bump yammer/coda/dropwizard metrics dependency version**
 
-Updated yammer metrics to version 3.1.2 (now it's been renamed to dropwizard). API has changed quite a bit, consult https://dropwizard.github.io/metrics/3.1.0/manual/core/ for additional information. 
+Updated yammer metrics to version 3.1.2 (now it's been renamed to dropwizard). API has changed quite a bit, consult https://dropwizard.github.io/metrics/3.1.0/manual/core/ for additional information.
 
 Note that among other things, in yammer 2.2.0 histograms were by default created in non-biased mode (uniform sampling), while in 3.1.0 histograms created via MetricsRegistry.histogram(...) are by default exponentially decayed. This shouldn't affect end users, though.
 
@@ -8375,7 +8375,7 @@ Following are the additional configurations added for this enhancement,
 
  For example: If source cluster FS client configurations are copied in peer cluster under directory /home/user/dc1/ then  hbase.replication.cluster.id should be configured as dc1 and hbase.replication.conf.dir as /home/user
 
-Note: 
+Note:
  a. Any modification to source cluster FS client configuration files in peer cluster side replication configuration directory then it needs to restart all its peer(s) cluster RS with default hbase.replication.source.fs.conf.provider.
  b. Only 'xml' type files will be loaded by the default hbase.replication.source.fs.conf.provider.
 
@@ -8573,7 +8573,7 @@ This patch adds shell support for region normalizer (see HBASE-13103).
  - 'normalizer\_switch' allows user to turn normalizer on and off
  - 'normalize' runs region normalizer if it's turned on.
 
-Also 'alter' command has been extended to allow user to enable/disable region normalization per table (disabled by default). Use it as 
+Also 'alter' command has been extended to allow user to enable/disable region normalization per table (disabled by default). Use it as
 
 alter 'testtable', {NORMALIZATION\_MODE =\> 'true'}
 
@@ -8871,14 +8871,14 @@ For more details on how to use the feature please consult the HBase Reference Gu
 
 Removed Table#getRowOrBefore, Region#getClosestRowBefore, Store#getRowKeyAtOrBefore, RemoteHTable#getRowOrBefore apis and Thrift support for getRowOrBefore.
 Also removed two coprocessor hooks preGetClosestRowBefore and postGetClosestRowBefore.
-User using this api can instead use reverse scan something like below, 
-{code} 
- Scan scan = new Scan(row); 
-  scan.setSmall(true); 
-  scan.setCaching(1); 
-  scan.setReversed(true); 
-  scan.addFamily(family); 
-{code} 
+User using this api can instead use reverse scan something like below,
+{code}
+ Scan scan = new Scan(row);
+  scan.setSmall(true);
+  scan.setCaching(1);
+  scan.setReversed(true);
+  scan.addFamily(family);
+{code}
 pass this scan object to the scanner and retrieve the first Result from scanner output.
 
 
@@ -8894,7 +8894,7 @@ Changes parameters to filterColumn so takes a Cell rather than a byte [].
 
 hbase-client-1.2.7-SNAPSHOT.jar, ColumnPrefixFilter.class
 package org.apache.hadoop.hbase.filter
-ColumnPrefixFilter.filterColumn ( byte[ ] buffer, int qualifierOffset, int qualifierLength )  :  Filter.ReturnCode 
+ColumnPrefixFilter.filterColumn ( byte[ ] buffer, int qualifierOffset, int qualifierLength )  :  Filter.ReturnCode
 org/apache/hadoop/hbase/filter/ColumnPrefixFilter.filterColumn:([BII)Lorg/apache/hadoop/hbase/filter/Filter$ReturnCode;
 
 Ditto for filterColumnValue in SingleColumnValueFilter. Takes a Cell instead of byte array.
@@ -9088,7 +9088,7 @@ hbase-shaded-client and hbase-shaded-server modules will not build the actual ja
 
 * [HBASE-13754](https://issues.apache.org/jira/browse/HBASE-13754) | *Major* | **Allow non KeyValue Cell types also to oswrite**
 
-This jira has removed the already deprecated method 
+This jira has removed the already deprecated method
 KeyValue#oswrite(final KeyValue kv, final OutputStream out)
 
 
@@ -9128,11 +9128,11 @@ Purge support for parsing zookeepers zoo.cfg deprecated since hbase-0.96.0
 
 MOTIVATION
 
-A pipelined scan API is introduced for speeding up applications that combine massive data traversal with compute-intensive processing. Traditional HBase scans save network trips through prefetching the data to the client side cache. However, they prefetch synchronously: the fetch request to regionserver is invoked only when the entire cache is consumed. This leads to a stop-and-wait access pattern, in which the client stalls until the next chunk of data is fetched. Applications that do s [...]
+A pipelined scan API is introduced for speeding up applications that combine massive data traversal with compute-intensive processing. Traditional HBase scans save network trips through prefetching the data to the client side cache. However, they prefetch synchronously: the fetch request to regionserver is invoked only when the entire cache is consumed. This leads to a stop-and-wait access pattern, in which the client stalls until the next chunk of data is fetched. Applications that do s [...]
 
 API AND CONFIGURATION
 
-Asynchronous scanning can be configured either globally for all tables and scans, or on per-scan basis via a new Scan class API. 
+Asynchronous scanning can be configured either globally for all tables and scans, or on per-scan basis via a new Scan class API.
 
 Configuration in hbase-site.xml: hbase.client.scanner.async.prefetch, default false:
 
@@ -9175,8 +9175,8 @@ Introduces a new config hbase.fs.tmp.dir which is a directory in HDFS (or defaul
 
 * [HBASE-10800](https://issues.apache.org/jira/browse/HBASE-10800) | *Major* | **Use CellComparator instead of KVComparator**
 
-From 2.0 branch onwards KVComparator and its subclasses MetaComparator, RawBytesComparator are all deprecated. 
-All the comparators are moved to CellComparator.  MetaCellComparator, a subclass of CellComparator, will be used to compare hbase:meta cells.  
+From 2.0 branch onwards KVComparator and its subclasses MetaComparator, RawBytesComparator are all deprecated.
+All the comparators are moved to CellComparator.  MetaCellComparator, a subclass of CellComparator, will be used to compare hbase:meta cells.
 Previously exposed static instances KeyValue.COMPARATOR, KeyValue.META\_COMPARATOR and KeyValue.RAW\_COMPARATOR are deprecated instead use CellComparator.COMPARATOR and CellComparator.META\_COMPARATOR.
 Also note that there will be no RawBytesComparator.  Where ever we need to compare raw bytes use Bytes.BYTES\_RAWCOMPARATOR.
 CellComparator will always operate on cells and its components, abstracting the fact that a cell can be backed by a single byte[] as opposed to how KVComparators were working.
@@ -9194,7 +9194,7 @@ Adds a renewLease call to ClientScanner
 * [HBASE-13564](https://issues.apache.org/jira/browse/HBASE-13564) | *Major* | **Master MBeans are not published**
 
 To use the coprocessor-based JMX implementation provided by HBase for Master.
-Add below property in hbase-site.xml file: 
+Add below property in hbase-site.xml file:
 
 \<property\>
   \<name\>hbase.coprocessor.master.classes\</name\>
@@ -9310,7 +9310,7 @@ Compose thrift exception text from the text of the entire cause chain of the und
 
 * [HBASE-13275](https://issues.apache.org/jira/browse/HBASE-13275) | *Major* | **Setting hbase.security.authorization to false does not disable authorization**
 
-Prior to this change the configuration setting 'hbase.security.authorization' had no effect if security coprocessor were installed. The act of installing the security coprocessors was assumed to indicate active authorizaton was desired and required. Now it is possible to install the security coprocessors yet have them operate in a passive state with active authorization disabled by setting 'hbase.security.authorization' to false. This can be useful but is probably not what you want. For  [...]
+Prior to this change the configuration setting 'hbase.security.authorization' had no effect if security coprocessor were installed. The act of installing the security coprocessors was assumed to indicate active authorizaton was desired and required. Now it is possible to install the security coprocessors yet have them operate in a passive state with active authorization disabled by setting 'hbase.security.authorization' to false. This can be useful but is probably not what you want. For  [...]
 
 'hbase.security.authorization' defaults to true for backwards comptatible behavior.
 
@@ -9346,15 +9346,15 @@ Use hbase.client.scanner.max.result.size instead to enforce practical chunk size
 
 Results returned from RPC calls may now be returned as partials
 
-When is a Result marked as a partial? 
+When is a Result marked as a partial?
 When the server must stop the scan because the max size limit has been reached. Means that the LAST Result returned within the ScanResult's Result array may be marked as a partial if the scan's max size limit caused it to stop in the middle of a row.
 
 Incompatible Change: The return type of InternalScanners#next and RegionScanners#nextRaw has been changed to NextState from boolean
 The previous boolean return value can be accessed via NextState#hasMoreValues()
 Provides more context as to what happened inside the scanner
 
-Scan caching default has been changed to Integer.Max\_Value 
-This value works together with the new maxResultSize value from HBASE-12976 (defaults to 2MB) 
+Scan caching default has been changed to Integer.Max\_Value
+This value works together with the new maxResultSize value from HBASE-12976 (defaults to 2MB)
 Results returned from server on basis of size rather than number of rows
 Provides better use of network since row size varies amongst tables
 
@@ -9672,14 +9672,14 @@ This client is on by default in master branch (2.0 hbase). It is off in branch-1
 Namespace auditor provides basic quota support for namespaces in terms of number of tables and number of regions. In order to use namespace quotas, quota support must be enabled by setting
 "hbase.quota.enabled" property to true in hbase-site.xml file.
 
-The users can add quota information to namespace, while creating new namespaces or by altering existing ones. 
+The users can add quota information to namespace, while creating new namespaces or by altering existing ones.
 
 Examples:
 1. create\_namespace 'ns1', {'hbase.namespace.quota.maxregions'=\>'10'}
 2. create\_namespace 'ns2', {'hbase.namespace.quota.maxtables'=\>'2','hbase.namespace.quota.maxregions'=\>'5'}
 3. alter\_namespace 'ns3', {METHOD =\> 'set', 'hbase.namespace.quota.maxtables'=\>'5','hbase.namespace.quota.maxregions'=\>'25'}
 
-The quotas can be modified/added to namespace at any point of time. To remove quotas, the following command can be used: 
+The quotas can be modified/added to namespace at any point of time. To remove quotas, the following command can be used:
 
 alter\_namespace 'ns3', {METHOD =\> 'unset', NAME =\> 'hbase.namespace.quota.maxtables'}
 alter\_namespace 'ns3', {METHOD =\> 'unset', NAME =\> 'hbase.namespace.quota.maxregions'}
@@ -9839,7 +9839,7 @@ NavigableMap\<byte [], List\<KeyValue\>\> getFamilyMap()
 * [HBASE-12084](https://issues.apache.org/jira/browse/HBASE-12084) | *Major* | **Remove deprecated APIs from Result**
 
 The below KeyValue based APIs are removed from Result
-KeyValue[] raw() 
+KeyValue[] raw()
 List\<KeyValue\> list()
 List\<KeyValue\> getColumn(byte [] family, byte [] qualifier)
 KeyValue getColumnLatest(byte [] family, byte [] qualifier)
@@ -9854,7 +9854,7 @@ Cell getColumnLatestCell(byte [] family, int foffset, int flength, byte [] quali
 respectively
 
 Also the constructors which were taking KeyValues also removed
-Result(KeyValue [] cells) 
+Result(KeyValue [] cells)
 Result(List\<KeyValue\> kvs)
 
 
@@ -9865,7 +9865,7 @@ Result(List\<KeyValue\> kvs)
 The following APIs are removed from Filter
 KeyValue transform(KeyValue)
 KeyValue getNextKeyHint(KeyValue)
-and replaced with 
+and replaced with
 Cell transformCell(Cell)
 Cell getNextCellHint(Cell)
 respectively.
@@ -10012,6 +10012,3 @@ To enable zoo.cfg reading, for which support may be removed in a future release,
         properties from a zoo.cfg file has been deprecated.
   \</description\>
 \</property\>
-
-
-
diff --git a/bin/considerAsDead.sh b/bin/considerAsDead.sh
index ae1b8d885bf..848e276cd00 100755
--- a/bin/considerAsDead.sh
+++ b/bin/considerAsDead.sh
@@ -17,7 +17,7 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 # */
-# 
+#
 
 usage="Usage: considerAsDead.sh --hostname serverName"
 
@@ -50,12 +50,12 @@ do
     rs_parts=(${rs//,/ })
     hostname=${rs_parts[0]}
     echo $deadhost
-    echo $hostname   
+    echo $hostname
     if [ "$deadhost" == "$hostname" ]; then
 		znode="$zkrs/$rs"
 		echo "ZNode Deleting:" $znode
 		$bin/hbase zkcli delete $znode > /dev/null 2>&1
 		sleep 1
-		ssh $HBASE_SSH_OPTS $hostname $remote_cmd 2>&1 | sed "s/^/$hostname: /"	
-    fi   
+		ssh $HBASE_SSH_OPTS $hostname $remote_cmd 2>&1 | sed "s/^/$hostname: /"
+    fi
 done
diff --git a/bin/hbase-cleanup.sh b/bin/hbase-cleanup.sh
index 92b40cca6ae..69c1f72b607 100755
--- a/bin/hbase-cleanup.sh
+++ b/bin/hbase-cleanup.sh
@@ -74,7 +74,7 @@ check_for_znodes() {
   znodes=`"$bin"/hbase zkcli ls $zparent/$zchild 2>&1 | tail -1 | sed "s/\[//" | sed "s/\]//"`
   if [ "$znodes" != "" ]; then
     echo -n "ZNode(s) [${znodes}] of $command are not expired. Exiting without cleaning hbase data."
-    echo #force a newline	
+    echo #force a newline
     exit 1;
   else
     echo -n "All ZNode(s) of $command are expired."
@@ -99,7 +99,7 @@ execute_clean_acls() {
 
 clean_up() {
   case $1 in
-  --cleanZk) 
+  --cleanZk)
     execute_zk_command "deleteall ${zparent}";
     ;;
   --cleanHdfs)
@@ -120,7 +120,7 @@ clean_up() {
     ;;
   *)
     ;;
-  esac	
+  esac
 }
 
 check_znode_exists() {
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 3e85ec59fb6..104e9a0b67c 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -103,7 +103,7 @@ do
     break
   fi
 done
- 
+
 # Allow alternate hbase conf dir location.
 HBASE_CONF_DIR="${HBASE_CONF_DIR:-$HBASE_HOME/conf}"
 # List of hbase regions servers.
@@ -162,7 +162,7 @@ fi
 # memory usage to explode. Tune the variable down to prevent vmem explosion.
 export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-4}
 
-# Now having JAVA_HOME defined is required 
+# Now having JAVA_HOME defined is required
 if [ -z "$JAVA_HOME" ]; then
     cat 1>&2 <<EOF
 +======================================================================+
diff --git a/bin/master-backup.sh b/bin/master-backup.sh
index feca4ab8657..5d3f7cb7561 100755
--- a/bin/master-backup.sh
+++ b/bin/master-backup.sh
@@ -17,7 +17,7 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 # */
-# 
+#
 # Run a shell command on all backup master hosts.
 #
 # Environment Variables
@@ -45,7 +45,7 @@ bin=`cd "$bin">/dev/null; pwd`
 . "$bin"/hbase-config.sh
 
 # If the master backup file is specified in the command line,
-# then it takes precedence over the definition in 
+# then it takes precedence over the definition in
 # hbase-env.sh. Save it here.
 HOSTLIST=$HBASE_BACKUP_MASTERS
 
@@ -69,6 +69,6 @@ if [ -f $HOSTLIST ]; then
      sleep $HBASE_SLAVE_SLEEP
    fi
   done
-fi 
+fi
 
 wait
diff --git a/bin/regionservers.sh b/bin/regionservers.sh
index b83c1f3c79e..b10e5a3ec9f 100755
--- a/bin/regionservers.sh
+++ b/bin/regionservers.sh
@@ -17,7 +17,7 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 # */
-# 
+#
 # Run a shell command on all regionserver hosts.
 #
 # Environment Variables
@@ -45,7 +45,7 @@ bin=`cd "$bin">/dev/null; pwd`
 . "$bin"/hbase-config.sh
 
 # If the regionservers file is specified in the command line,
-# then it takes precedence over the definition in 
+# then it takes precedence over the definition in
 # hbase-env.sh. Save it here.
 HOSTLIST=$HBASE_REGIONSERVERS
 
diff --git a/bin/stop-hbase.sh b/bin/stop-hbase.sh
index b47ae1f7743..d10e618f2d2 100755
--- a/bin/stop-hbase.sh
+++ b/bin/stop-hbase.sh
@@ -52,7 +52,7 @@ fi
 
 export HBASE_LOG_PREFIX=hbase-$HBASE_IDENT_STRING-master-$HOSTNAME
 export HBASE_LOGFILE=$HBASE_LOG_PREFIX.log
-logout=$HBASE_LOG_DIR/$HBASE_LOG_PREFIX.out  
+logout=$HBASE_LOG_DIR/$HBASE_LOG_PREFIX.out
 loglog="${HBASE_LOG_DIR}/${HBASE_LOGFILE}"
 pid=${HBASE_PID_DIR:-/tmp}/hbase-$HBASE_IDENT_STRING-master.pid
 
@@ -74,7 +74,7 @@ fi
 # distributed == false means that the HMaster will kill ZK when it exits
 # HBASE-6504 - only take the first line of the output in case verbose gc is on
 distMode=`$bin/hbase --config "$HBASE_CONF_DIR" org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed | head -n 1`
-if [ "$distMode" == 'true' ] 
+if [ "$distMode" == 'true' ]
 then
   "$bin"/hbase-daemons.sh --config "${HBASE_CONF_DIR}" stop zookeeper
 fi
diff --git a/bin/test/process_based_cluster.sh b/bin/test/process_based_cluster.sh
index eb8633f502c..1c4c7253213 100755
--- a/bin/test/process_based_cluster.sh
+++ b/bin/test/process_based_cluster.sh
@@ -68,7 +68,7 @@ while [ $# -ne 0 ]; do
     -h|--help)
       print_usage ;;
     --kill)
-      IS_KILL=1 
+      IS_KILL=1
       cmd_specified ;;
     --show)
       IS_SHOW=1
@@ -106,5 +106,3 @@ else
   echo "No command specified" >&2
   exit 1
 fi
-
-
diff --git a/bin/zookeepers.sh b/bin/zookeepers.sh
index 97bf41b6052..5d22d82a559 100755
--- a/bin/zookeepers.sh
+++ b/bin/zookeepers.sh
@@ -17,7 +17,7 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 # */
-# 
+#
 # Run a shell command on all zookeeper hosts.
 #
 # Environment Variables
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index e049fd6d853..06720b4d5e3 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -33,7 +33,7 @@
 # The maximum amount of heap to use. Default is left to JVM default.
 # export HBASE_HEAPSIZE=1G
 
-# Uncomment below if you intend to use off heap cache. For example, to allocate 8G of 
+# Uncomment below if you intend to use off heap cache. For example, to allocate 8G of
 # offheap, set the value to "8G".
 # export HBASE_OFFHEAPSIZE=1G
 
@@ -70,7 +70,7 @@
 # export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M"
 
 # See the package documentation for org.apache.hadoop.hbase.io.hfile for other configurations
-# needed setting up off-heap block caching. 
+# needed setting up off-heap block caching.
 
 # Uncomment and adjust to enable JMX exporting
 # See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to configure remote password access.
@@ -101,7 +101,7 @@
 # Where log files are stored.  $HBASE_HOME/logs by default.
 # export HBASE_LOG_DIR=${HBASE_HOME}/logs
 
-# Enable remote JDWP debugging of major HBase processes. Meant for Core Developers 
+# Enable remote JDWP debugging of major HBase processes. Meant for Core Developers
 # export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8070"
 # export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8071"
 # export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8072"
@@ -125,13 +125,13 @@
 # Tell HBase whether it should manage it's own instance of ZooKeeper or not.
 # export HBASE_MANAGES_ZK=true
 
-# The default log rolling policy is RFA, where the log file is rolled as per the size defined for the 
+# The default log rolling policy is RFA, where the log file is rolled as per the size defined for the
 # RFA appender. Please refer to the log4j2.properties file to see more details on this appender.
 # In case one needs to do log rolling on a date change, one should set the environment property
 # HBASE_ROOT_LOGGER to "<DESIRED_LOG LEVEL>,DRFA".
 # For example:
 # export HBASE_ROOT_LOGGER=INFO,DRFA
-# The reason for changing default to RFA is to avoid the boundary case of filling out disk space as 
+# The reason for changing default to RFA is to avoid the boundary case of filling out disk space as
 # DRFA doesn't put any cap on the log size. Please refer to HBase-5655 for more context.
 
 # Tell HBase whether it should include Hadoop's lib when start up,
diff --git a/conf/hbase-policy.xml b/conf/hbase-policy.xml
index bf472407d17..5a0256d5164 100644
--- a/conf/hbase-policy.xml
+++ b/conf/hbase-policy.xml
@@ -24,20 +24,20 @@
   <property>
     <name>security.client.protocol.acl</name>
     <value>*</value>
-    <description>ACL for ClientProtocol and AdminProtocol implementations (ie. 
+    <description>ACL for ClientProtocol and AdminProtocol implementations (ie.
     clients talking to HRegionServers)
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
+    The ACL is a comma-separated list of user and group names. The user and
+    group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
   </property>
 
   <property>
     <name>security.admin.protocol.acl</name>
     <value>*</value>
-    <description>ACL for HMasterInterface protocol implementation (ie. 
+    <description>ACL for HMasterInterface protocol implementation (ie.
     clients talking to HMaster for admin operations).
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
+    The ACL is a comma-separated list of user and group names. The user and
+    group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
   </property>
 
@@ -46,8 +46,8 @@
     <value>*</value>
     <description>ACL for HMasterRegionInterface protocol implementations
     (for HRegionServers communicating with HMaster)
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
+    The ACL is a comma-separated list of user and group names. The user and
+    group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
   </property>
 </configuration>
diff --git a/dev-support/HBase Code Template.xml b/dev-support/HBase Code Template.xml
index 3b666c97a8a..9c69a5a40b3 100644
--- a/dev-support/HBase Code Template.xml	
+++ b/dev-support/HBase Code Template.xml	
@@ -38,4 +38,4 @@ ${type_declaration}</template><template autoinsert="true" context="classbody_con
 </template><template autoinsert="true" context="catchblock_context" deleted="true" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
 ${exception_var}.printStackTrace();</template><template autoinsert="false" context="methodbody_context" deleted="true" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Implement ${enclosing_type}.${enclosing_method}
 ${body_statement}</template><template autoinsert="false" context="constructorbody_context" deleted="true" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
-// ${todo} Implement constructor</template><template autoinsert="true" context="getterbody_context" deleted="true" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="true" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</templa [...]
\ No newline at end of file
+// ${todo} Implement constructor</template><template autoinsert="true" context="getterbody_context" deleted="true" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="true" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</templa [...]
diff --git a/dev-support/HOW_TO_YETUS_LOCAL.md b/dev-support/HOW_TO_YETUS_LOCAL.md
index 8d22978d422..2ac4ecd09dc 100644
--- a/dev-support/HOW_TO_YETUS_LOCAL.md
+++ b/dev-support/HOW_TO_YETUS_LOCAL.md
@@ -87,7 +87,7 @@ these personalities; a pre-packaged personality can be selected via the
 `--project` parameter. There is a provided HBase personality in Yetus, however
 the HBase project maintains its own within the HBase source repository. Specify
 the path to the personality file using `--personality`. The HBase repository
-places this file under `dev-support/hbase-personality.sh`. 
+places this file under `dev-support/hbase-personality.sh`.
 
 ## Docker mode
 
diff --git a/dev-support/hbase_nightly_pseudo-distributed-test.sh b/dev-support/hbase_nightly_pseudo-distributed-test.sh
index bf5051267be..8d03195715c 100755
--- a/dev-support/hbase_nightly_pseudo-distributed-test.sh
+++ b/dev-support/hbase_nightly_pseudo-distributed-test.sh
@@ -340,53 +340,53 @@ EOF
 
 echo "writing out example TSV to example.tsv"
 cat >"${working_dir}/example.tsv" <<EOF
-row1	value8	value8	
+row1	value8	value8
 row3			value2
-row2	value9		
-row10		value1	
+row2	value9
+row10		value1
 pow1	value8		value8
-pow3		value2	
+pow3		value2
 pow2			value9
-pow10	value1		
+pow10	value1
 paw1		value8	value8
-paw3	value2		
-paw2		value9	
+paw3	value2
+paw2		value9
 paw10			value1
-raw1	value8	value8	
+raw1	value8	value8
 raw3			value2
-raw2	value9		
-raw10		value1	
+raw2	value9
+raw10		value1
 aow1	value8		value8
-aow3		value2	
+aow3		value2
 aow2			value9
-aow10	value1		
+aow10	value1
 aaw1		value8	value8
-aaw3	value2		
-aaw2		value9	
+aaw3	value2
+aaw2		value9
 aaw10			value1
-how1	value8	value8	
+how1	value8	value8
 how3			value2
-how2	value9		
-how10		value1	
+how2	value9
+how10		value1
 zow1	value8		value8
-zow3		value2	
+zow3		value2
 zow2			value9
-zow10	value1		
+zow10	value1
 zaw1		value8	value8
-zaw3	value2		
-zaw2		value9	
+zaw3	value2
+zaw2		value9
 zaw10			value1
-haw1	value8	value8	
+haw1	value8	value8
 haw3			value2
-haw2	value9		
-haw10		value1	
+haw2	value9
+haw10		value1
 low1	value8		value8
-low3		value2	
+low3		value2
 low2			value9
-low10	value1		
+low10	value1
 law1		value8	value8
-law3	value2		
-law2		value9	
+law3	value2
+law2		value9
 law10			value1
 EOF
 
diff --git a/dev-support/hbasetests.sh b/dev-support/hbasetests.sh
index 50c3a51bcdd..55cd0babcca 100755
--- a/dev-support/hbasetests.sh
+++ b/dev-support/hbasetests.sh
@@ -53,7 +53,7 @@ runAllTests=0
 
 #set to 1 to replay the failed tests. Previous reports are kept in
 # fail_ files
-replayFailed=0 
+replayFailed=0
 
 #set to 0 to run all medium & large tests in a single maven operation
 # instead of two
@@ -85,10 +85,10 @@ mvnCommand="mvn "
 function createListDeadProcess {
   id=$$
   listDeadProcess=""
-  
+
   #list of the process with a ppid of 1
   sonProcess=`ps -o pid= --ppid 1`
-  
+
   #then the process with a pgid of the script
   for pId in $sonProcess
   do
@@ -119,32 +119,32 @@ function cleanProcess {
       jstack -F -l $pId
       kill $pId
       echo "kill sent, waiting for 30 seconds"
-      sleep 30      
+      sleep 30
       son=`ps -o pid= --pid $pId | wc -l`
       if (test $son -gt 0)
-      then 
+      then
         echo "$pId, java sub process of $id, is still running after a standard kill, using kill -9 now"
         echo "Stack for $pId before kill -9:"
         jstack -F -l $pId
         kill -9 $pId
         echo "kill sent, waiting for 2 seconds"
-        sleep 2           
-        echo "Process $pId killed by kill -9" 
+        sleep 2
+        echo "Process $pId killed by kill -9"
       else
-        echo "Process $pId killed by standard kill -15" 
+        echo "Process $pId killed by standard kill -15"
       fi
     else
       echo "$pId is not a java process (it's $name), I don't kill it."
     fi
   done
-  
+
   createListDeadProcess
   if (test ${#listDeadProcess} -gt 0)
   then
     echo "There are still $sonProcess for process $id left."
   else
-    echo "Process $id clean, no son process left"      
-  fi  
+    echo "Process $id clean, no son process left"
+  fi
 }
 
 #count the number of ',' in a string
@@ -155,7 +155,7 @@ function countClasses {
   count=$((cars - 1))
 }
 
-  
+
 ######################################### script
 echo "Starting Script. Possible parameters are: runAllTests, replayFailed, nonParallelMaven"
 echo "Other parameters are sent to maven"
@@ -177,11 +177,11 @@ do
       if [ $arg == "nonParallelMaven" ]
       then
         parallelMaven=0
-      else  
-         args=$args" $arg"        
+      else
+         args=$args" $arg"
       fi
     fi
-  fi   
+  fi
 done
 
 
@@ -195,24 +195,24 @@ for testFile in $testsList
 do
   lenPath=$((${#rootTestClassDirectory}))
   len=$((${#testFile} - $lenPath - 5))  # len(".java") == 5
-  
-  shortTestFile=${testFile:lenPath:$len}  
+
+  shortTestFile=${testFile:lenPath:$len}
   testName=$(echo $shortTestFile | sed 's/\//\./g')
-  
+
   #The ',' is used in the grep pattern as we don't want to catch
   # partial name
   isFlaky=$((`echo $flakyTests | grep "$testName," | wc -l`))
-  
+
   if (test $isFlaky -eq 0)
-  then    
+  then
     isSmall=0
     isMedium=0
     isLarge=0
-  
-    # determine the category of the test by greping into the source code 
+
+    # determine the category of the test by greping into the source code
     isMedium=`grep "@Category" $testFile | grep "MediumTests.class" | wc -l`
-    if (test $isMedium -eq 0) 
-    then 
+    if (test $isMedium -eq 0)
+    then
       isLarge=`grep "@Category" $testFile | grep "LargeTests.class" | wc -l`
       if (test $isLarge -eq 0)
       then
@@ -230,22 +230,22 @@ do
         fi
       fi
     fi
-    
+
     #put the test in the right list
-    if (test $isSmall -gt 0) 
-    then 
+    if (test $isSmall -gt 0)
+    then
       smallList="$smallList,$testName"
-    fi    
-    if (test $isMedium -gt 0) 
-    then 
+    fi
+    if (test $isMedium -gt 0)
+    then
       mediumList="$mediumList,$testName"
-    fi    
-    if (test $isLarge -gt 0) 
-    then 
+    fi
+    if (test $isLarge -gt 0)
+    then
       largeList="$largeList,$testName"
-    fi        
-    
-  fi   
+    fi
+
+  fi
 done
 
 #remove the ',' at the beginning
@@ -285,7 +285,7 @@ do
     nextList=2
     runList1=$runList1,$testClass
   else
-    nextList=1 
+    nextList=1
     runList2=$runList2,$testClass
   fi
 done
@@ -297,27 +297,27 @@ runList2=${runList2:1:${#runList2}}
 #now we can run the tests, at last!
 
 echo "Running small tests with one maven instance, in parallel"
-#echo Small tests are $smallList 
-$mvnCommand -P singleJVMTests test -Dtest=$smallList  $args 
+#echo Small tests are $smallList
+$mvnCommand -P singleJVMTests test -Dtest=$smallList  $args
 cleanProcess
 
 exeTime=$(((`date +%s` - $startTime)/60))
 echo "Small tests executed after $exeTime minutes"
 
 if (test $parallelMaven -gt 0)
-then 
+then
   echo "Running tests with two maven instances in parallel"
   $mvnCommand -P localTests test -Dtest=$runList1  $args &
-  
+
   #give some time  to the fist process if there is anything to compile
   sleep 30
   $mvnCommand -P localTests test -Dtest=$runList2  $args
 
   #wait for forked process to finish
   wait
-  
+
   cleanProcess
-  
+
   exeTime=$(((`date +%s` - $startTime)/60))
   echo "Medium and large (if selected) tests executed after $exeTime minutes"
 
@@ -329,14 +329,14 @@ then
     $mvnCommand -P localTests test -Dtest=$flakyTests $args
     cleanProcess
     exeTime=$(((`date +%s` - $startTime)/60))
-    echo "Flaky tests executed after $exeTime minutes"    
+    echo "Flaky tests executed after $exeTime minutes"
   fi
 else
   echo "Running tests with a single maven instance, no parallelization"
   $mvnCommand -P localTests test -Dtest=$runList1,$runList2,$flakyTests $args
-  cleanProcess  
+  cleanProcess
   exeTime=$(((`date +%s` - $startTime)/60))
-  echo "Single maven instance tests executed after $exeTime minutes"     
+  echo "Single maven instance tests executed after $exeTime minutes"
 fi
 
 #let's analyze the results
@@ -360,7 +360,7 @@ for testClass in `echo $fullRunList | sed 's/,/ /g'`
 do
   reportFile=$surefireReportDirectory/$testClass.txt
   outputReportFile=$surefireReportDirectory/$testClass-output.txt
-  
+
   if [ -s $reportFile ];
   then
     isError=`grep FAILURE $reportFile | wc -l`
@@ -368,22 +368,22 @@ do
     then
       errorList="$errorList,$testClass"
       errorCounter=$(($errorCounter + 1))
-      
-      #let's copy the files if we want to use it later      
+
+      #let's copy the files if we want to use it later
       cp $reportFile "$surefireReportDirectory/fail_$timestamp.$testClass.txt"
       if [ -s $reportFile ];
       then
         cp $outputReportFile "$surefireReportDirectory/fail_$timestamp.$testClass"-output.txt""
       fi
     else
-     
+
       sucessCounter=$(($sucessCounter +1))
-    fi  
+    fi
   else
      #report file does not exist or is empty => the test didn't finish
      notFinishedCounter=$(($notFinishedCounter + 1))
      notFinishedList="$notFinishedList,$testClass"
-  fi  
+  fi
 done
 
 #list of all tests that failed
@@ -411,7 +411,7 @@ echo
 echo "Tests in error are: $errorPresList"
 echo "Tests that didn't finish are: $notFinishedPresList"
 echo
-echo "Execution time in minutes: $exeTime" 
+echo "Execution time in minutes: $exeTime"
 echo "##########################"
 
 
diff --git a/dev-support/jenkinsEnv.sh b/dev-support/jenkinsEnv.sh
index d7fe87339e2..969ece4dc4c 100755
--- a/dev-support/jenkinsEnv.sh
+++ b/dev-support/jenkinsEnv.sh
@@ -33,4 +33,3 @@ export PATH=$PATH:$JAVA_HOME/bin:$ANT_HOME/bin:
 export MAVEN_OPTS="${MAVEN_OPTS:-"-Xmx3100M -XX:-UsePerfData"}"
 
 ulimit -n
-
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 73691791f6a..1892d5a906e 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -21,7 +21,7 @@
 # timestamp suffix. Deploys builds to maven.
 #
 # To finish, check what was build.  If good copy to people.apache.org and
-# close the maven repos.  Call a vote. 
+# close the maven repos.  Call a vote.
 #
 # Presumes that dev-support/generate-hadoopX-poms.sh has already been run.
 # Presumes your settings.xml all set up so can sign artifacts published to mvn, etc.
diff --git a/dev-support/rebase_all_git_branches.sh b/dev-support/rebase_all_git_branches.sh
index ef213c8fb3d..5c63e405469 100755
--- a/dev-support/rebase_all_git_branches.sh
+++ b/dev-support/rebase_all_git_branches.sh
@@ -17,11 +17,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# This script assumes that your remote is called "origin" 
+# This script assumes that your remote is called "origin"
 # and that your local master branch is called "master".
 # I am sure it could be made more abstract but these are the defaults.
 
-# Edit this line to point to your default directory, 
+# Edit this line to point to your default directory,
 # or always pass a directory to the script.
 
 DEFAULT_DIR="EDIT_ME"
@@ -69,13 +69,13 @@ function check_git_branch_status {
 }
 
 function get_jira_status {
-  # This function expects as an argument the JIRA ID, 
+  # This function expects as an argument the JIRA ID,
   # and returns 99 if resolved and 1 if it couldn't
   # get the status.
 
-  # The JIRA status looks like this in the HTML: 
+  # The JIRA status looks like this in the HTML:
   # span id="resolution-val" class="value resolved" >
-  # The following is a bit brittle, but filters for lines with 
+  # The following is a bit brittle, but filters for lines with
   # resolution-val returns 99 if it's resolved
   jira_url='https://issues.apache.org/jira/rest/api/2/issue'
   jira_id="$1"
@@ -106,7 +106,7 @@ while getopts ":hd:" opt; do
       print_usage
       exit 0
       ;;
-    *)  
+    *)
       echo "Invalid argument: $OPTARG" >&2
       print_usage >&2
       exit 1
@@ -135,7 +135,7 @@ get_tracking_branches
 for i in "${tracking_branches[@]}"; do
   git checkout -q "$i"
   # Exit if git status is dirty
-  check_git_branch_status 
+  check_git_branch_status
   git pull -q --rebase
   status=$?
   if [ "$status" -ne 0 ]; then
@@ -169,7 +169,7 @@ for i in "${all_branches[@]}"; do
   git checkout -q "$i"
 
   # Exit if git status is dirty
-  check_git_branch_status 
+  check_git_branch_status
 
   # If this branch has a remote, don't rebase it
   # If it has a remote, it has a log with at least one entry
@@ -184,7 +184,7 @@ for i in "${all_branches[@]}"; do
       echo "Failed. Rolling back. Rebase $i manually."
       git rebase --abort
     fi
-  elif [ $status -ne 0 ]; then 
+  elif [ $status -ne 0 ]; then
   # If status is 0 it means there is a remote branch, we already took care of it
     echo "Unknown error: $?" >&2
     exit 1
@@ -195,10 +195,10 @@ done
 for i in "${deleted_branches[@]}"; do
   read -p "$i's JIRA is resolved. Delete? " yn
   case $yn in
-    [Yy]) 
+    [Yy])
         git branch -D $i
         ;;
-    *) 
+    *)
         echo "To delete it manually, run git branch -D $deleted_branches"
         ;;
   esac
diff --git a/dev-support/smart-apply-patch.sh b/dev-support/smart-apply-patch.sh
index 9200e3ba921..a8a22b06ef1 100755
--- a/dev-support/smart-apply-patch.sh
+++ b/dev-support/smart-apply-patch.sh
@@ -52,7 +52,7 @@ if $PATCH -p0 -E --dry-run < $PATCH_FILE 2>&1 > $TMP; then
   # correct place to put those files.
 
 #  NOTE 2014/07/17:
-#  Temporarily disabling below check since our jenkins boxes seems to be not defaulting to bash 
+#  Temporarily disabling below check since our jenkins boxes seems to be not defaulting to bash
 #  causing below checks to fail. Once it is fixed, we can revert the commit and enable this again.
 
 #  TMP2=/tmp/tmp.paths.2.$$
diff --git a/dev-support/test-util.sh b/dev-support/test-util.sh
index 9219bb96606..b97e2de383f 100755
--- a/dev-support/test-util.sh
+++ b/dev-support/test-util.sh
@@ -32,7 +32,7 @@ options:
    -h          Show this message
    -c          Run 'mvn clean' before running the tests
    -f FILE     Run the additional tests listed in the FILE
-   -u          Only run unit tests. Default is to run 
+   -u          Only run unit tests. Default is to run
                unit and integration tests
    -n N        Run each test N times. Default = 1.
    -s N        Print N slowest tests
@@ -92,7 +92,7 @@ do
         r)
             server=1
             ;;
-	 ?) 
+	 ?)
 	     usage
 	     exit 1
      esac
@@ -175,7 +175,7 @@ done
 
 # Print a report of the slowest running tests
 if [ ! -z $showSlowest ]; then
-    
+
     testNameIdx=0
     for (( i = 0; i < ${#test[@]}; i++ ))
     do
diff --git a/dev-support/zombie-detector.sh b/dev-support/zombie-detector.sh
index df4c197ce4d..3a2708a14ad 100755
--- a/dev-support/zombie-detector.sh
+++ b/dev-support/zombie-detector.sh
@@ -29,7 +29,7 @@
 #set -x
 # printenv
 
-### Setup some variables.  
+### Setup some variables.
 bindir=$(dirname $0)
 
 # This key is set by our surefire configuration up in the main pom.xml
diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml
index 8098b4321bf..39cd5c2fa14 100644
--- a/hbase-annotations/pom.xml
+++ b/hbase-annotations/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
   /**
@@ -21,8 +21,8 @@
   -->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
+    <artifactId>hbase</artifactId>
     <version>2.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
index c2510efb026..d9bae849063 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the client. This tests the hbase-client package and all of the client
  * tests in hbase-server.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
index 4341becbd68..a168adec08a 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to coprocessors.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
index a91033fa2d3..84f346baaea 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the {@code org.apache.hadoop.hbase.filter} package.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
index 22fbc1b724f..c23bfa298b3 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as failing commonly on public build infrastructure.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
index c2375ca4e5c..8eee0e6ae4b 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the {@code org.apache.hadoop.hbase.io} package. Things like HFile and
  * the like.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
index 6bc712e270c..4e555b73fed 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
@@ -15,23 +15,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as 'integration/system' test, meaning that the test class has the following
  * characteristics:
  * <ul>
- *  <li> Possibly takes hours to complete</li>
- *  <li> Can be run on a mini cluster or an actual cluster</li>
- *  <li> Can make changes to the given cluster (starting stopping daemons, etc)</li>
- *  <li> Should not be run in parallel of other integration tests</li>
+ * <li>Possibly takes hours to complete</li>
+ * <li>Can be run on a mini cluster or an actual cluster</li>
+ * <li>Can make changes to the given cluster (starting stopping daemons, etc)</li>
+ * <li>Should not be run in parallel of other integration tests</li>
  * </ul>
- *
- * Integration / System tests should have a class name starting with "IntegrationTest", and
- * should be annotated with @Category(IntegrationTests.class). Integration tests can be run
- * using the IntegrationTestsDriver class or from mvn verify.
- *
+ * Integration / System tests should have a class name starting with "IntegrationTest", and should
+ * be annotated with @Category(IntegrationTests.class). Integration tests can be run using the
+ * IntegrationTestsDriver class or from mvn verify.
  * @see SmallTests
  * @see MediumTests
  * @see LargeTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
index aa183d5607d..b47e5bab9a4 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,21 +15,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tagging a test as 'large', means that the test class has the following characteristics:
  * <ul>
- *  <li>it can executed in an isolated JVM (Tests can however be executed in different JVM on the
- *  same  machine simultaneously so be careful two concurrent tests end up fighting over ports
- *  or other singular resources).</li>
- *  <li>ideally, the whole large test-suite/class, no matter how many or how few test methods it
- *  has, will run in last less than three minutes</li>
- *  <li>No large test can take longer than ten minutes; it will be killed. See 'Integeration Tests'
- *  if you need to run tests longer than this.</li>
+ * <li>it can executed in an isolated JVM (Tests can however be executed in different JVM on the
+ * same machine simultaneously so be careful two concurrent tests end up fighting over ports or
+ * other singular resources).</li>
+ * <li>ideally, the whole large test-suite/class, no matter how many or how few test methods it has,
+ * will run in last less than three minutes</li>
+ * <li>No large test can take longer than ten minutes; it will be killed. See 'Integeration Tests'
+ * if you need to run tests longer than this.</li>
  * </ul>
- *
  * @see SmallTests
  * @see MediumTests
  * @see IntegrationTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
index 4b49da4e4dc..0e68ab3c034 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to mapred or mapreduce.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
index e837f49a268..5dcf51b27e5 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the master.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
index 0f8055b5bab..d1f836ec004 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,21 +15,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tagging a test as 'medium' means that the test class has the following characteristics:
  * <ul>
- *  <li>it can be executed in an isolated JVM (Tests can however be executed in different JVMs on
- *  the  same  machine simultaneously so be careful two concurrent tests end up fighting over ports
- *  or other singular resources).</li>
- *  <li>ideally, the whole medium test-suite/class, no matter how many or how few test methods it
- *  has, will complete in 50 seconds; otherwise make it a 'large' test.</li>
+ * <li>it can be executed in an isolated JVM (Tests can however be executed in different JVMs on the
+ * same machine simultaneously so be careful two concurrent tests end up fighting over ports or
+ * other singular resources).</li>
+ * <li>ideally, the whole medium test-suite/class, no matter how many or how few test methods it
+ * has, will complete in 50 seconds; otherwise make it a 'large' test.</li>
  * </ul>
- *
- *  Use it for tests that cannot be tagged as 'small'. Use it when you need to start up a cluster.
- *
+ * Use it for tests that cannot be tagged as 'small'. Use it when you need to start up a cluster.
  * @see SmallTests
  * @see LargeTests
  * @see IntegrationTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java
index 59962a74c28..27beaacf963 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
index 2759bfc96df..695042e801b 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as not easily falling into any of the below categories.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
index 4edb9bf031d..929bd6487ed 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to RPC.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
index 0f03b761fcb..3439afa76eb 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the regionserver.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
index 8b8be4de812..df606c960c2 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to replication.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
index e7d1d1d4c88..a648b4c39e0 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the REST capability of HBase.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
index 5263d467cbe..a4e55ad3aba 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to security.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
index 80e6c9d2420..64d2bce381b 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,14 +20,14 @@ package org.apache.hadoop.hbase.testclassification;
 /**
  * Tagging a test as 'small' means that the test class has the following characteristics:
  * <ul>
- *  <li>it can be run simultaneously with other small tests all in the same JVM</li>
- *  <li>ideally, the WHOLE implementing test-suite/class, no matter how many or how few test
- *  methods it has, should take less than 15 seconds to complete</li>
- *  <li>it does not use a cluster</li>
+ * <li>it can be run simultaneously with other small tests all in the same JVM</li>
+ * <li>ideally, the WHOLE implementing test-suite/class, no matter how many or how few test methods
+ * it has, should take less than 15 seconds to complete</li>
+ * <li>it does not use a cluster</li>
  * </ul>
- *
  * @see MediumTests
  * @see LargeTests
  * @see IntegrationTests
  */
-public interface SmallTests {}
+public interface SmallTests {
+}
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
index efc8d5ddc84..d1f433b9719 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
- * Tag a test as related to  mapreduce and taking longer than 5 minutes to run on public build
+ * Tag a test as related to mapreduce and taking longer than 5 minutes to run on public build
  * infrastructure.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
index 85507de5ad4..f556979e5b6 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as region tests which takes longer than 5 minutes to run on public build
  * infrastructure.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java
index 86aa6bdc85e..9fa0579ed47 100644
--- a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml b/hbase-archetypes/hbase-archetype-builder/pom.xml
index fa2bac1919a..d9c69c53b57 100644
--- a/hbase-archetypes/hbase-archetype-builder/pom.xml
+++ b/hbase-archetypes/hbase-archetype-builder/pom.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
   /**
    * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,8 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>hbase-archetypes</artifactId>
     <groupId>org.apache.hbase</groupId>
+    <artifactId>hbase-archetypes</artifactId>
     <version>2.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
@@ -58,10 +57,10 @@
             further using xml-maven-plugin for xslt transformation, below. -->
           <execution>
             <id>hbase-client__copy-src-to-build-archetype-subdir</id>
-            <phase>generate-resources</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
+            <phase>generate-resources</phase>
             <configuration>
               <outputDirectory>/${project.basedir}/../${hbase-client.dir}/${build.archetype.subdir}</outputDirectory>
               <resources>
@@ -76,29 +75,30 @@
           </execution>
           <execution>
             <id>hbase-client__copy-pom-to-temp-for-xslt-processing</id>
-            <phase>generate-resources</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
+            <phase>generate-resources</phase>
             <configuration>
               <outputDirectory>/${project.basedir}/../${hbase-client.dir}/${temp.exemplar.subdir}</outputDirectory>
               <resources>
                 <resource>
                   <directory>/${project.basedir}/../${hbase-client.dir}</directory>
-                  <filtering>true</filtering> <!-- filtering replaces ${project.version} with literal -->
+                  <filtering>true</filtering>
+                  <!-- filtering replaces ${project.version} with literal -->
                   <includes>
                     <include>pom.xml</include>
                   </includes>
-                 </resource>
+                </resource>
               </resources>
             </configuration>
           </execution>
           <execution>
             <id>hbase-shaded-client__copy-src-to-build-archetype-subdir</id>
-            <phase>generate-resources</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
+            <phase>generate-resources</phase>
             <configuration>
               <outputDirectory>/${project.basedir}/../${hbase-shaded-client.dir}/${build.archetype.subdir}</outputDirectory>
               <resources>
@@ -113,20 +113,21 @@
           </execution>
           <execution>
             <id>hbase-shaded-client__copy-pom-to-temp-for-xslt-processing</id>
-            <phase>generate-resources</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
+            <phase>generate-resources</phase>
             <configuration>
               <outputDirectory>/${project.basedir}/../${hbase-shaded-client.dir}/${temp.exemplar.subdir}</outputDirectory>
               <resources>
                 <resource>
                   <directory>/${project.basedir}/../${hbase-shaded-client.dir}</directory>
-                  <filtering>true</filtering> <!-- filtering replaces ${project.version} with literal -->
+                  <filtering>true</filtering>
+                  <!-- filtering replaces ${project.version} with literal -->
                   <includes>
                     <include>pom.xml</include>
                   </includes>
-                 </resource>
+                </resource>
               </resources>
             </configuration>
           </execution>
@@ -137,10 +138,10 @@
             using xml-maven-plugin for xslt transformation, below.  -->
           <execution>
             <id>hbase-client-ARCHETYPE__copy-pom-to-temp-for-xslt-processing</id>
-            <phase>prepare-package</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
+            <phase>prepare-package</phase>
             <configuration>
               <outputDirectory>/${project.basedir}/../${hbase-client.dir}/${temp.archetype.subdir}</outputDirectory>
               <resources>
@@ -149,16 +150,16 @@
                   <includes>
                     <include>pom.xml</include>
                   </includes>
-                 </resource>
+                </resource>
               </resources>
             </configuration>
           </execution>
           <execution>
             <id>hbase-shaded-client-ARCHETYPE__copy-pom-to-temp-for-xslt-processing</id>
-            <phase>prepare-package</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
+            <phase>prepare-package</phase>
             <configuration>
               <outputDirectory>/${project.basedir}/../${hbase-shaded-client.dir}/${temp.archetype.subdir}</outputDirectory>
               <resources>
@@ -167,7 +168,7 @@
                   <includes>
                     <include>pom.xml</include>
                   </includes>
-                 </resource>
+                </resource>
               </resources>
             </configuration>
           </execution>
@@ -183,10 +184,10 @@
           <!-- xml-maven-plugin modifies each exemplar project's pom.xml file to convert to standalone project. -->
           <execution>
             <id>modify-exemplar-pom-files-via-xslt</id>
-            <phase>process-resources</phase>
             <goals>
               <goal>transform</goal>
             </goals>
+            <phase>process-resources</phase>
             <configuration>
               <transformationSets>
                 <transformationSet>
@@ -213,10 +214,10 @@
                prevent warnings when project is generated from archetype.  -->
           <execution>
             <id>modify-archetype-pom-files-via-xslt</id>
-            <phase>package</phase>
             <goals>
               <goal>transform</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <transformationSets>
                 <transformationSet>
@@ -243,32 +244,32 @@
       </plugin>
 
       <plugin>
-      <artifactId>maven-antrun-plugin</artifactId>
+        <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <!-- exec-maven-plugin executes chmod to make scripts executable -->
           <execution>
             <id>make-scripts-executable</id>
-            <phase>process-resources</phase>
             <goals>
               <goal>run</goal>
             </goals>
+            <phase>process-resources</phase>
             <configuration>
-              <chmod file="${project.basedir}/createArchetypes.sh" perm="+x" />
-              <chmod file="${project.basedir}/installArchetypes.sh" perm="+x" />
+              <chmod file="${project.basedir}/createArchetypes.sh" perm="+x"/>
+              <chmod file="${project.basedir}/installArchetypes.sh" perm="+x"/>
             </configuration>
           </execution>
           <!-- exec-maven-plugin executes script which invokes 'archetype:create-from-project'
                to derive archetypes from exemplar projects. -->
           <execution>
             <id>run-createArchetypes-script</id>
-            <phase>compile</phase>
             <goals>
               <goal>run</goal>
             </goals>
+            <phase>compile</phase>
             <configuration>
-              <exec executable="${shell-executable}" dir="${project.basedir}" failonerror="true">
-                 <arg line="./createArchetypes.sh"/>
-               </exec>
+              <exec dir="${project.basedir}" executable="${shell-executable}" failonerror="true">
+                <arg line="./createArchetypes.sh"/>
+              </exec>
             </configuration>
           </execution>
           <!-- exec-maven-plugin executes script which invokes 'install' to install each
@@ -278,14 +279,14 @@
                which does test generation of a project based on the archetype. -->
           <execution>
             <id>run-installArchetypes-script</id>
-            <phase>install</phase>
             <goals>
               <goal>run</goal>
             </goals>
+            <phase>install</phase>
             <configuration>
-              <exec executable="${shell-executable}" dir="${project.basedir}" failonerror="true">
-                 <arg line="./installArchetypes.sh"/>
-               </exec>
+              <exec dir="${project.basedir}" executable="${shell-executable}" failonerror="true">
+                <arg line="./installArchetypes.sh"/>
+              </exec>
             </configuration>
           </execution>
         </executions>
diff --git a/hbase-archetypes/hbase-client-project/pom.xml b/hbase-archetypes/hbase-client-project/pom.xml
index 40cfab27f12..13b79a23e21 100644
--- a/hbase-archetypes/hbase-client-project/pom.xml
+++ b/hbase-archetypes/hbase-client-project/pom.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation=
-           "https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +21,8 @@
 -->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>hbase-archetypes</artifactId>
     <groupId>org.apache.hbase</groupId>
+    <artifactId>hbase-archetypes</artifactId>
     <version>2.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
diff --git a/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java b/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java
index 5164ab21716..198ee1c7afd 100644
--- a/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java
+++ b/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java
@@ -1,5 +1,4 @@
-/**
- *
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -38,19 +37,17 @@ import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.util.Bytes;
 
 /**
- * Successful running of this application requires access to an active instance
- * of HBase. For install instructions for a standalone instance of HBase, please
- * refer to https://hbase.apache.org/book.html#quickstart
+ * Successful running of this application requires access to an active instance of HBase. For
+ * install instructions for a standalone instance of HBase, please refer to
+ * https://hbase.apache.org/book.html#quickstart
  */
 public final class HelloHBase {
 
   protected static final String MY_NAMESPACE_NAME = "myTestNamespace";
   static final TableName MY_TABLE_NAME = TableName.valueOf("myTestTable");
   static final byte[] MY_COLUMN_FAMILY_NAME = Bytes.toBytes("cf");
-  static final byte[] MY_FIRST_COLUMN_QUALIFIER
-          = Bytes.toBytes("myFirstColumn");
-  static final byte[] MY_SECOND_COLUMN_QUALIFIER
-          = Bytes.toBytes("mySecondColumn");
+  static final byte[] MY_FIRST_COLUMN_QUALIFIER = Bytes.toBytes("myFirstColumn");
+  static final byte[] MY_SECOND_COLUMN_QUALIFIER = Bytes.toBytes("mySecondColumn");
   static final byte[] MY_ROW_ID = Bytes.toBytes("rowId01");
 
   // Private constructor included here to avoid checkstyle warnings
@@ -61,21 +58,21 @@ public final class HelloHBase {
     final boolean deleteAllAtEOJ = true;
 
     /**
-     * ConnectionFactory#createConnection() automatically looks for
-     * hbase-site.xml (HBase configuration parameters) on the system's
-     * CLASSPATH, to enable creation of Connection to HBase via ZooKeeper.
+     * ConnectionFactory#createConnection() automatically looks for hbase-site.xml (HBase
+     * configuration parameters) on the system's CLASSPATH, to enable creation of Connection to
+     * HBase via ZooKeeper.
      */
     try (Connection connection = ConnectionFactory.createConnection();
-            Admin admin = connection.getAdmin()) {
+      Admin admin = connection.getAdmin()) {
 
       admin.getClusterStatus(); // assure connection successfully established
-      System.out.println("\n*** Hello HBase! -- Connection has been "
-              + "established via ZooKeeper!!\n");
+      System.out
+        .println("\n*** Hello HBase! -- Connection has been " + "established via ZooKeeper!!\n");
 
       createNamespaceAndTable(admin);
 
       System.out.println("Getting a Table object for [" + MY_TABLE_NAME
-              + "] with which to perform CRUD operations in HBase.");
+        + "] with which to perform CRUD operations in HBase.");
       try (Table table = connection.getTable(MY_TABLE_NAME)) {
 
         putRowToTable(table);
@@ -93,9 +90,8 @@ public final class HelloHBase {
   }
 
   /**
-   * Invokes Admin#createNamespace and Admin#createTable to create a namespace
-   * with a table that has one column-family.
-   *
+   * Invokes Admin#createNamespace and Admin#createTable to create a namespace with a table that has
+   * one column-family.
    * @param admin Standard Admin object
    * @throws IOException If IO problem encountered
    */
@@ -104,48 +100,38 @@ public final class HelloHBase {
     if (!namespaceExists(admin, MY_NAMESPACE_NAME)) {
       System.out.println("Creating Namespace [" + MY_NAMESPACE_NAME + "].");
 
-      admin.createNamespace(NamespaceDescriptor
-              .create(MY_NAMESPACE_NAME).build());
+      admin.createNamespace(NamespaceDescriptor.create(MY_NAMESPACE_NAME).build());
     }
     if (!admin.tableExists(MY_TABLE_NAME)) {
       System.out.println("Creating Table [" + MY_TABLE_NAME.getNameAsString()
-              + "], with one Column Family ["
-              + Bytes.toString(MY_COLUMN_FAMILY_NAME) + "].");
+        + "], with one Column Family [" + Bytes.toString(MY_COLUMN_FAMILY_NAME) + "].");
       TableDescriptor desc = TableDescriptorBuilder.newBuilder(MY_TABLE_NAME)
-              .setColumnFamily(ColumnFamilyDescriptorBuilder.of(MY_COLUMN_FAMILY_NAME))
-              .build();
+        .setColumnFamily(ColumnFamilyDescriptorBuilder.of(MY_COLUMN_FAMILY_NAME)).build();
       admin.createTable(desc);
     }
   }
 
   /**
-   * Invokes Table#put to store a row (with two new columns created 'on the
-   * fly') into the table.
-   *
+   * Invokes Table#put to store a row (with two new columns created 'on the fly') into the table.
    * @param table Standard Table object (used for CRUD operations).
    * @throws IOException If IO problem encountered
    */
   static void putRowToTable(final Table table) throws IOException {
 
-    table.put(new Put(MY_ROW_ID).addColumn(MY_COLUMN_FAMILY_NAME,
-            MY_FIRST_COLUMN_QUALIFIER,
-            Bytes.toBytes("Hello")).addColumn(MY_COLUMN_FAMILY_NAME,
-                    MY_SECOND_COLUMN_QUALIFIER,
-                    Bytes.toBytes("World!")));
-
-    System.out.println("Row [" + Bytes.toString(MY_ROW_ID)
-            + "] was put into Table ["
-            + table.getName().getNameAsString() + "] in HBase;\n"
-            + "  the row's two columns (created 'on the fly') are: ["
-            + Bytes.toString(MY_COLUMN_FAMILY_NAME) + ":"
-            + Bytes.toString(MY_FIRST_COLUMN_QUALIFIER)
-            + "] and [" + Bytes.toString(MY_COLUMN_FAMILY_NAME) + ":"
-            + Bytes.toString(MY_SECOND_COLUMN_QUALIFIER) + "]");
+    table.put(new Put(MY_ROW_ID)
+      .addColumn(MY_COLUMN_FAMILY_NAME, MY_FIRST_COLUMN_QUALIFIER, Bytes.toBytes("Hello"))
+      .addColumn(MY_COLUMN_FAMILY_NAME, MY_SECOND_COLUMN_QUALIFIER, Bytes.toBytes("World!")));
+
+    System.out.println("Row [" + Bytes.toString(MY_ROW_ID) + "] was put into Table ["
+      + table.getName().getNameAsString() + "] in HBase;\n"
+      + "  the row's two columns (created 'on the fly') are: ["
+      + Bytes.toString(MY_COLUMN_FAMILY_NAME) + ":" + Bytes.toString(MY_FIRST_COLUMN_QUALIFIER)
+      + "] and [" + Bytes.toString(MY_COLUMN_FAMILY_NAME) + ":"
+      + Bytes.toString(MY_SECOND_COLUMN_QUALIFIER) + "]");
   }
 
   /**
    * Invokes Table#get and prints out the contents of the retrieved row.
-   *
    * @param table Standard Table object
    * @throws IOException If IO problem encountered
    */
@@ -153,38 +139,32 @@ public final class HelloHBase {
 
     Result row = table.get(new Get(MY_ROW_ID));
 
-    System.out.println("Row [" + Bytes.toString(row.getRow())
-            + "] was retrieved from Table ["
-            + table.getName().getNameAsString()
-            + "] in HBase, with the following content:");
+    System.out.println("Row [" + Bytes.toString(row.getRow()) + "] was retrieved from Table ["
+      + table.getName().getNameAsString() + "] in HBase, with the following content:");
 
-    for (Entry<byte[], NavigableMap<byte[], byte[]>> colFamilyEntry
-            : row.getNoVersionMap().entrySet()) {
+    for (Entry<byte[], NavigableMap<byte[], byte[]>> colFamilyEntry : row.getNoVersionMap()
+      .entrySet()) {
       String columnFamilyName = Bytes.toString(colFamilyEntry.getKey());
 
-      System.out.println("  Columns in Column Family [" + columnFamilyName
-              + "]:");
+      System.out.println("  Columns in Column Family [" + columnFamilyName + "]:");
 
-      for (Entry<byte[], byte[]> columnNameAndValueMap
-              : colFamilyEntry.getValue().entrySet()) {
+      for (Entry<byte[], byte[]> columnNameAndValueMap : colFamilyEntry.getValue().entrySet()) {
 
         System.out.println("    Value of Column [" + columnFamilyName + ":"
-                + Bytes.toString(columnNameAndValueMap.getKey()) + "] == "
-                + Bytes.toString(columnNameAndValueMap.getValue()));
+          + Bytes.toString(columnNameAndValueMap.getKey()) + "] == "
+          + Bytes.toString(columnNameAndValueMap.getValue()));
       }
     }
   }
 
   /**
    * Checks to see whether a namespace exists.
-   *
-   * @param admin Standard Admin object
+   * @param admin         Standard Admin object
    * @param namespaceName Name of namespace
    * @return true If namespace exists
    * @throws IOException If IO problem encountered
    */
-  static boolean namespaceExists(final Admin admin, final String namespaceName)
-          throws IOException {
+  static boolean namespaceExists(final Admin admin, final String namespaceName) throws IOException {
     try {
       admin.getNamespaceDescriptor(namespaceName);
     } catch (NamespaceNotFoundException e) {
@@ -195,28 +175,24 @@ public final class HelloHBase {
 
   /**
    * Invokes Table#delete to delete test data (i.e. the row)
-   *
    * @param table Standard Table object
    * @throws IOException If IO problem is encountered
    */
   static void deleteRow(final Table table) throws IOException {
-    System.out.println("Deleting row [" + Bytes.toString(MY_ROW_ID)
-            + "] from Table ["
-            + table.getName().getNameAsString() + "].");
+    System.out.println("Deleting row [" + Bytes.toString(MY_ROW_ID) + "] from Table ["
+      + table.getName().getNameAsString() + "].");
     table.delete(new Delete(MY_ROW_ID));
   }
 
   /**
-   * Invokes Admin#disableTable, Admin#deleteTable, and Admin#deleteNamespace to
-   * disable/delete Table and delete Namespace.
-   *
+   * Invokes Admin#disableTable, Admin#deleteTable, and Admin#deleteNamespace to disable/delete
+   * Table and delete Namespace.
    * @param admin Standard Admin object
    * @throws IOException If IO problem is encountered
    */
   static void deleteNamespaceAndTable(final Admin admin) throws IOException {
     if (admin.tableExists(MY_TABLE_NAME)) {
-      System.out.println("Disabling/deleting Table ["
-              + MY_TABLE_NAME.getNameAsString() + "].");
+      System.out.println("Disabling/deleting Table [" + MY_TABLE_NAME.getNameAsString() + "].");
       admin.disableTable(MY_TABLE_NAME); // Disable a table before deleting it.
       admin.deleteTable(MY_TABLE_NAME);
     }
diff --git a/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java b/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java
index 9a92e606ffb..b08ecf7ab1b 100644
--- a/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java
+++ b/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -44,10 +44,9 @@ public class TestHelloHBase {
 
   @ClassRule
   public static final HBaseClassTestRule CLASS_RULE =
-      HBaseClassTestRule.forClass(TestHelloHBase.class);
+    HBaseClassTestRule.forClass(TestHelloHBase.class);
 
-  private static final HBaseTestingUtility TEST_UTIL
-          = new HBaseTestingUtility();
+  private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
 
   @BeforeClass
   public static void beforeClass() throws Exception {
@@ -67,13 +66,11 @@ public class TestHelloHBase {
     Admin admin = TEST_UTIL.getAdmin();
 
     exists = HelloHBase.namespaceExists(admin, NONEXISTENT_NAMESPACE);
-    assertEquals("#namespaceExists failed: found nonexistent namespace.",
-            false, exists);
+    assertEquals("#namespaceExists failed: found nonexistent namespace.", false, exists);
 
     admin.createNamespace(NamespaceDescriptor.create(EXISTING_NAMESPACE).build());
     exists = HelloHBase.namespaceExists(admin, EXISTING_NAMESPACE);
-    assertEquals("#namespaceExists failed: did NOT find existing namespace.",
-            true, exists);
+    assertEquals("#namespaceExists failed: did NOT find existing namespace.", true, exists);
     admin.deleteNamespace(EXISTING_NAMESPACE);
   }
 
@@ -82,14 +79,11 @@ public class TestHelloHBase {
     Admin admin = TEST_UTIL.getAdmin();
     HelloHBase.createNamespaceAndTable(admin);
 
-    boolean namespaceExists
-            = HelloHBase.namespaceExists(admin, HelloHBase.MY_NAMESPACE_NAME);
-    assertEquals("#createNamespaceAndTable failed to create namespace.",
-            true, namespaceExists);
+    boolean namespaceExists = HelloHBase.namespaceExists(admin, HelloHBase.MY_NAMESPACE_NAME);
+    assertEquals("#createNamespaceAndTable failed to create namespace.", true, namespaceExists);
 
     boolean tableExists = admin.tableExists(HelloHBase.MY_TABLE_NAME);
-    assertEquals("#createNamespaceAndTable failed to create table.",
-            true, tableExists);
+    assertEquals("#createNamespaceAndTable failed to create table.", true, tableExists);
 
     admin.disableTable(HelloHBase.MY_TABLE_NAME);
     admin.deleteTable(HelloHBase.MY_TABLE_NAME);
@@ -100,8 +94,7 @@ public class TestHelloHBase {
   public void testPutRowToTable() throws IOException {
     Admin admin = TEST_UTIL.getAdmin();
     admin.createNamespace(NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build());
-    Table table
-            = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME);
+    Table table = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME);
 
     HelloHBase.putRowToTable(table);
     Result row = table.get(new Get(HelloHBase.MY_ROW_ID));
@@ -115,13 +108,10 @@ public class TestHelloHBase {
   public void testDeleteRow() throws IOException {
     Admin admin = TEST_UTIL.getAdmin();
     admin.createNamespace(NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build());
-    Table table
-            = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME);
+    Table table = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME);
 
-    table.put(new Put(HelloHBase.MY_ROW_ID).
-            addColumn(HelloHBase.MY_COLUMN_FAMILY_NAME,
-                    HelloHBase.MY_FIRST_COLUMN_QUALIFIER,
-                    Bytes.toBytes("xyz")));
+    table.put(new Put(HelloHBase.MY_ROW_ID).addColumn(HelloHBase.MY_COLUMN_FAMILY_NAME,
+      HelloHBase.MY_FIRST_COLUMN_QUALIFIER, Bytes.toBytes("xyz")));
     HelloHBase.deleteRow(table);
     Result row = table.get(new Get(HelloHBase.MY_ROW_ID));
     assertEquals("#deleteRow failed to delete row.", true, row.isEmpty());
diff --git a/hbase-archetypes/hbase-shaded-client-project/pom.xml b/hbase-archetypes/hbase-shaded-client-project/pom.xml
index 73305ea12de..e0f5053c082 100644
--- a/hbase-archetypes/hbase-shaded-client-project/pom.xml
+++ b/hbase-archetypes/hbase-shaded-client-project/pom.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation=
-           "https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +21,8 @@
 -->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>hbase-archetypes</artifactId>
     <groupId>org.apache.hbase</groupId>
+    <artifactId>hbase-archetypes</artifactId>
     <version>2.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
@@ -44,16 +41,16 @@
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-testing-util</artifactId>
       <scope>test</scope>
-       <exclusions>
-         <exclusion>
-           <groupId>javax.xml.bind</groupId>
-           <artifactId>jaxb-api</artifactId>
-         </exclusion>
-         <exclusion>
-           <groupId>javax.ws.rs</groupId>
-           <artifactId>jsr311-api</artifactId>
-         </exclusion>
-       </exclusions>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.ws.rs</groupId>
+          <artifactId>jsr311-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
diff --git a/hbase-archetypes/hbase-shaded-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/shaded_client/HelloHBase.java b/hbase-archetypes/hbase-shaded-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/shaded_client/HelloHBase.java
index 94a1e711d47..44629174601 100644
--- a/hbase-archetypes/hbase-shaded-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/shaded_client/HelloHBase.java
+++ b/hbase-archetypes/hbase-shaded-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/shaded_client/HelloHBase.java
@@ -1,5 +1,4 @@
-/**
- *
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -37,19 +36,17 @@ import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.util.Bytes;
 
 /**
- * Successful running of this application requires access to an active instance
- * of HBase. For install instructions for a standalone instance of HBase, please
- * refer to https://hbase.apache.org/book.html#quickstart
+ * Successful running of this application requires access to an active instance of HBase. For
+ * install instructions for a standalone instance of HBase, please refer to
+ * https://hbase.apache.org/book.html#quickstart
  */
 public final class HelloHBase {
 
   protected static final String MY_NAMESPACE_NAME = "myTestNamespace";
   static final TableName MY_TABLE_NAME = TableName.valueOf("myTestTable");
   static final byte[] MY_COLUMN_FAMILY_NAME = Bytes.toBytes("cf");
-  static final byte[] MY_FIRST_COLUMN_QUALIFIER
-          = Bytes.toBytes("myFirstColumn");
-  static final byte[] MY_SECOND_COLUMN_QUALIFIER
-          = Bytes.toBytes("mySecondColumn");
+  static final byte[] MY_FIRST_COLUMN_QUALIFIER = Bytes.toBytes("myFirstColumn");
+  static final byte[] MY_SECOND_COLUMN_QUALIFIER = Bytes.toBytes("mySecondColumn");
   static final byte[] MY_ROW_ID = Bytes.toBytes("rowId01");
 
   // Private constructor included here to avoid checkstyle warnings
@@ -60,21 +57,21 @@ public final class HelloHBase {
     final boolean deleteAllAtEOJ = true;
 
     /**
-     * ConnectionFactory#createConnection() automatically looks for
-     * hbase-site.xml (HBase configuration parameters) on the system's
-     * CLASSPATH, to enable creation of Connection to HBase via ZooKeeper.
+     * ConnectionFactory#createConnection() automatically looks for hbase-site.xml (HBase
+     * configuration parameters) on the system's CLASSPATH, to enable creation of Connection to
+     * HBase via ZooKeeper.
      */
     try (Connection connection = ConnectionFactory.createConnection();
-            Admin admin = connection.getAdmin()) {
+      Admin admin = connection.getAdmin()) {
 
       admin.getClusterStatus(); // assure connection successfully established
-      System.out.println("\n*** Hello HBase! -- Connection has been "
-              + "established via ZooKeeper!!\n");
+      System.out
+        .println("\n*** Hello HBase! -- Connection has been " + "established via ZooKeeper!!\n");
 
       createNamespaceAndTable(admin);
 
       System.out.println("Getting a Table object for [" + MY_TABLE_NAME
-              + "] with which to perform CRUD operations in HBase.");
+        + "] with which to perform CRUD operations in HBase.");
       try (Table table = connection.getTable(MY_TABLE_NAME)) {
 
         putRowToTable(table);
@@ -92,9 +89,8 @@ public final class HelloHBase {
   }
 
   /**
-   * Invokes Admin#createNamespace and Admin#createTable to create a namespace
-   * with a table that has one column-family.
-   *
+   * Invokes Admin#createNamespace and Admin#createTable to create a namespace with a table that has
+   * one column-family.
    * @param admin Standard Admin object
    * @throws IOException If IO problem encountered
    */
@@ -103,47 +99,38 @@ public final class HelloHBase {
     if (!namespaceExists(admin, MY_NAMESPACE_NAME)) {
       System.out.println("Creating Namespace [" + MY_NAMESPACE_NAME + "].");
 
-      admin.createNamespace(NamespaceDescriptor
-              .create(MY_NAMESPACE_NAME).build());
+      admin.createNamespace(NamespaceDescriptor.create(MY_NAMESPACE_NAME).build());
     }
     if (!admin.tableExists(MY_TABLE_NAME)) {
       System.out.println("Creating Table [" + MY_TABLE_NAME.getNameAsString()
-              + "], with one Column Family ["
-              + Bytes.toString(MY_COLUMN_FAMILY_NAME) + "].");
+        + "], with one Column Family [" + Bytes.toString(MY_COLUMN_FAMILY_NAME) + "].");
 
       admin.createTable(new HTableDescriptor(MY_TABLE_NAME)
-              .addFamily(new HColumnDescriptor(MY_COLUMN_FAMILY_NAME)));
+        .addFamily(new HColumnDescriptor(MY_COLUMN_FAMILY_NAME)));
     }
   }
 
   /**
-   * Invokes Table#put to store a row (with two new columns created 'on the
-   * fly') into the table.
-   *
+   * Invokes Table#put to store a row (with two new columns created 'on the fly') into the table.
    * @param table Standard Table object (used for CRUD operations).
    * @throws IOException If IO problem encountered
    */
   static void putRowToTable(final Table table) throws IOException {
 
-    table.put(new Put(MY_ROW_ID).addColumn(MY_COLUMN_FAMILY_NAME,
-            MY_FIRST_COLUMN_QUALIFIER,
-            Bytes.toBytes("Hello")).addColumn(MY_COLUMN_FAMILY_NAME,
-                    MY_SECOND_COLUMN_QUALIFIER,
-                    Bytes.toBytes("World!")));
-
-    System.out.println("Row [" + Bytes.toString(MY_ROW_ID)
-            + "] was put into Table ["
-            + table.getName().getNameAsString() + "] in HBase;\n"
-            + "  the row's two columns (created 'on the fly') are: ["
-            + Bytes.toString(MY_COLUMN_FAMILY_NAME) + ":"
-            + Bytes.toString(MY_FIRST_COLUMN_QUALIFIER)
-            + "] and [" + Bytes.toString(MY_COLUMN_FAMILY_NAME) + ":"
-            + Bytes.toString(MY_SECOND_COLUMN_QUALIFIER) + "]");
+    table.put(new Put(MY_ROW_ID)
+      .addColumn(MY_COLUMN_FAMILY_NAME, MY_FIRST_COLUMN_QUALIFIER, Bytes.toBytes("Hello"))
+      .addColumn(MY_COLUMN_FAMILY_NAME, MY_SECOND_COLUMN_QUALIFIER, Bytes.toBytes("World!")));
+
+    System.out.println("Row [" + Bytes.toString(MY_ROW_ID) + "] was put into Table ["
+      + table.getName().getNameAsString() + "] in HBase;\n"
+      + "  the row's two columns (created 'on the fly') are: ["
+      + Bytes.toString(MY_COLUMN_FAMILY_NAME) + ":" + Bytes.toString(MY_FIRST_COLUMN_QUALIFIER)
+      + "] and [" + Bytes.toString(MY_COLUMN_FAMILY_NAME) + ":"
+      + Bytes.toString(MY_SECOND_COLUMN_QUALIFIER) + "]");
   }
 
   /**
    * Invokes Table#get and prints out the contents of the retrieved row.
-   *
    * @param table Standard Table object
    * @throws IOException If IO problem encountered
    */
@@ -151,38 +138,32 @@ public final class HelloHBase {
 
     Result row = table.get(new Get(MY_ROW_ID));
 
-    System.out.println("Row [" + Bytes.toString(row.getRow())
-            + "] was retrieved from Table ["
-            + table.getName().getNameAsString()
-            + "] in HBase, with the following content:");
+    System.out.println("Row [" + Bytes.toString(row.getRow()) + "] was retrieved from Table ["
+      + table.getName().getNameAsString() + "] in HBase, with the following content:");
 
-    for (Entry<byte[], NavigableMap<byte[], byte[]>> colFamilyEntry
-            : row.getNoVersionMap().entrySet()) {
+    for (Entry<byte[], NavigableMap<byte[], byte[]>> colFamilyEntry : row.getNoVersionMap()
+      .entrySet()) {
       String columnFamilyName = Bytes.toString(colFamilyEntry.getKey());
 
-      System.out.println("  Columns in Column Family [" + columnFamilyName
-              + "]:");
+      System.out.println("  Columns in Column Family [" + columnFamilyName + "]:");
 
-      for (Entry<byte[], byte[]> columnNameAndValueMap
-              : colFamilyEntry.getValue().entrySet()) {
+      for (Entry<byte[], byte[]> columnNameAndValueMap : colFamilyEntry.getValue().entrySet()) {
 
         System.out.println("    Value of Column [" + columnFamilyName + ":"
-                + Bytes.toString(columnNameAndValueMap.getKey()) + "] == "
-                + Bytes.toString(columnNameAndValueMap.getValue()));
+          + Bytes.toString(columnNameAndValueMap.getKey()) + "] == "
+          + Bytes.toString(columnNameAndValueMap.getValue()));
       }
     }
   }
 
   /**
    * Checks to see whether a namespace exists.
-   *
-   * @param admin Standard Admin object
+   * @param admin         Standard Admin object
    * @param namespaceName Name of namespace
    * @return true If namespace exists
    * @throws IOException If IO problem encountered
    */
-  static boolean namespaceExists(final Admin admin, final String namespaceName)
-          throws IOException {
+  static boolean namespaceExists(final Admin admin, final String namespaceName) throws IOException {
     try {
       admin.getNamespaceDescriptor(namespaceName);
     } catch (NamespaceNotFoundException e) {
@@ -193,28 +174,24 @@ public final class HelloHBase {
 
   /**
    * Invokes Table#delete to delete test data (i.e. the row)
-   *
    * @param table Standard Table object
    * @throws IOException If IO problem is encountered
    */
   static void deleteRow(final Table table) throws IOException {
-    System.out.println("Deleting row [" + Bytes.toString(MY_ROW_ID)
-            + "] from Table ["
-            + table.getName().getNameAsString() + "].");
+    System.out.println("Deleting row [" + Bytes.toString(MY_ROW_ID) + "] from Table ["
+      + table.getName().getNameAsString() + "].");
     table.delete(new Delete(MY_ROW_ID));
   }
 
   /**
-   * Invokes Admin#disableTable, Admin#deleteTable, and Admin#deleteNamespace to
-   * disable/delete Table and delete Namespace.
-   *
+   * Invokes Admin#disableTable, Admin#deleteTable, and Admin#deleteNamespace to disable/delete
+   * Table and delete Namespace.
    * @param admin Standard Admin object
    * @throws IOException If IO problem is encountered
    */
   static void deleteNamespaceAndTable(final Admin admin) throws IOException {
     if (admin.tableExists(MY_TABLE_NAME)) {
-      System.out.println("Disabling/deleting Table ["
-              + MY_TABLE_NAME.getNameAsString() + "].");
+      System.out.println("Disabling/deleting Table [" + MY_TABLE_NAME.getNameAsString() + "].");
       admin.disableTable(MY_TABLE_NAME); // Disable a table before deleting it.
       admin.deleteTable(MY_TABLE_NAME);
     }
diff --git a/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java b/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java
index 0f0f7d91ade..f87d9d7c700 100644
--- a/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java
+++ b/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -44,10 +44,9 @@ public class TestHelloHBase {
 
   @ClassRule
   public static final HBaseClassTestRule CLASS_RULE =
-      HBaseClassTestRule.forClass(TestHelloHBase.class);
+    HBaseClassTestRule.forClass(TestHelloHBase.class);
 
-  private static final HBaseTestingUtility TEST_UTIL
-          = new HBaseTestingUtility();
+  private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
 
   @BeforeClass
   public static void beforeClass() throws Exception {
@@ -67,13 +66,11 @@ public class TestHelloHBase {
     Admin admin = TEST_UTIL.getAdmin();
 
     exists = HelloHBase.namespaceExists(admin, NONEXISTENT_NAMESPACE);
-    assertEquals("#namespaceExists failed: found nonexistent namespace.",
-            false, exists);
+    assertEquals("#namespaceExists failed: found nonexistent namespace.", false, exists);
 
     admin.createNamespace(NamespaceDescriptor.create(EXISTING_NAMESPACE).build());
     exists = HelloHBase.namespaceExists(admin, EXISTING_NAMESPACE);
-    assertEquals("#namespaceExists failed: did NOT find existing namespace.",
-            true, exists);
+    assertEquals("#namespaceExists failed: did NOT find existing namespace.", true, exists);
     admin.deleteNamespace(EXISTING_NAMESPACE);
   }
 
@@ -82,14 +79,11 @@ public class TestHelloHBase {
     Admin admin = TEST_UTIL.getAdmin();
     HelloHBase.createNamespaceAndTable(admin);
 
-    boolean namespaceExists
-            = HelloHBase.namespaceExists(admin, HelloHBase.MY_NAMESPACE_NAME);
-    assertEquals("#createNamespaceAndTable failed to create namespace.",
-            true, namespaceExists);
+    boolean namespaceExists = HelloHBase.namespaceExists(admin, HelloHBase.MY_NAMESPACE_NAME);
+    assertEquals("#createNamespaceAndTable failed to create namespace.", true, namespaceExists);
 
     boolean tableExists = admin.tableExists(HelloHBase.MY_TABLE_NAME);
-    assertEquals("#createNamespaceAndTable failed to create table.",
-            true, tableExists);
+    assertEquals("#createNamespaceAndTable failed to create table.", true, tableExists);
 
     admin.disableTable(HelloHBase.MY_TABLE_NAME);
     admin.deleteTable(HelloHBase.MY_TABLE_NAME);
@@ -100,8 +94,7 @@ public class TestHelloHBase {
   public void testPutRowToTable() throws IOException {
     Admin admin = TEST_UTIL.getAdmin();
     admin.createNamespace(NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build());
-    Table table
-            = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME);
+    Table table = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME);
 
     HelloHBase.putRowToTable(table);
     Result row = table.get(new Get(HelloHBase.MY_ROW_ID));
@@ -115,13 +108,10 @@ public class TestHelloHBase {
   public void testDeleteRow() throws IOException {
     Admin admin = TEST_UTIL.getAdmin();
     admin.createNamespace(NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build());
-    Table table
-            = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME);
+    Table table = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME);
 
-    table.put(new Put(HelloHBase.MY_ROW_ID).
-            addColumn(HelloHBase.MY_COLUMN_FAMILY_NAME,
-                    HelloHBase.MY_FIRST_COLUMN_QUALIFIER,
-                    Bytes.toBytes("xyz")));
+    table.put(new Put(HelloHBase.MY_ROW_ID).addColumn(HelloHBase.MY_COLUMN_FAMILY_NAME,
+      HelloHBase.MY_FIRST_COLUMN_QUALIFIER, Bytes.toBytes("xyz")));
     HelloHBase.deleteRow(table);
     Result row = table.get(new Get(HelloHBase.MY_ROW_ID));
     assertEquals("#deleteRow failed to delete row.", true, row.isEmpty());
diff --git a/hbase-archetypes/pom.xml b/hbase-archetypes/pom.xml
index d5ce4d4156a..dd228abcc86 100644
--- a/hbase-archetypes/pom.xml
+++ b/hbase-archetypes/pom.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
   /**
    * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +21,8 @@
   -->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>hbase-build-configuration</artifactId>
     <groupId>org.apache.hbase</groupId>
+    <artifactId>hbase-build-configuration</artifactId>
     <version>2.6.0-SNAPSHOT</version>
     <relativePath>../hbase-build-configuration</relativePath>
   </parent>
@@ -68,10 +67,10 @@
         <artifactId>spotbugs-maven-plugin</artifactId>
         <executions>
           <execution>
-            <inherited>false</inherited>
             <goals>
               <goal>spotbugs</goal>
             </goals>
+            <inherited>false</inherited>
             <configuration>
               <excludeFilterFile>${project.basedir}/../dev-support/spotbugs-exclude.xml</excludeFilterFile>
             </configuration>
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 4f5c45b0176..cc4ffc10f2f 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
     /**
@@ -21,160 +21,18 @@
     -->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>hbase-build-configuration</artifactId>
     <groupId>org.apache.hbase</groupId>
+    <artifactId>hbase-build-configuration</artifactId>
     <version>2.6.0-SNAPSHOT</version>
     <relativePath>../hbase-build-configuration</relativePath>
   </parent>
   <artifactId>hbase-assembly</artifactId>
-  <name>Apache HBase - Assembly</name>
-  <description>
-        Module that does project assembly and that is all that it does.
-    </description>
   <packaging>pom</packaging>
+  <name>Apache HBase - Assembly</name>
+  <description>Module that does project assembly and that is all that it does.</description>
   <properties>
     <license.bundles.dependencies>true</license.bundles.dependencies>
   </properties>
-  <build>
-    <plugins>
-      <!-- licensing info from our dependencies -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>aggregate-licenses</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-            <configuration>
-              <properties>
-                <copyright-end-year>${build.year}</copyright-end-year>
-                <debug-print-included-work-info>${license.debug.print.included}</debug-print-included-work-info>
-                <bundled-dependencies>${license.bundles.dependencies}</bundled-dependencies>
-                <bundled-jquery>${license.bundles.jquery}</bundled-jquery>
-                <bundled-vega>${license.bundles.vega}</bundled-vega>
-                <bundled-logo>${license.bundles.logo}</bundled-logo>
-                <bundled-bootstrap>${license.bundles.bootstrap}</bundled-bootstrap>
-              </properties>
-              <resourceBundles>
-                <resourceBundle>${project.groupId}:hbase-resource-bundle:${project.version}</resourceBundle>
-              </resourceBundles>
-              <supplementalModelArtifacts>
-                <supplementalModelArtifact>${project.groupId}:hbase-resource-bundle:${project.version}</supplementalModelArtifact>
-              </supplementalModelArtifacts>
-              <supplementalModels>
-                <supplementalModel>supplemental-models.xml</supplementalModel>
-              </supplementalModels>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <!--Else will use hbase-assembly as final name.-->
-          <finalName>hbase-${project.version}</finalName>
-          <skipAssembly>false</skipAssembly>
-          <appendAssemblyId>true</appendAssemblyId>
-          <tarLongFileMode>posix</tarLongFileMode>
-          <descriptors>
-            <descriptor>${assembly.file}</descriptor>
-            <descriptor>src/main/assembly/client.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-	        <!-- generates the file that will be used by the bin/hbase script in the dev env -->
-            <id>create-hbase-generated-classpath</id>
-            <phase>test</phase>
-            <goals>
-              <goal>build-classpath</goal>
-            </goals>
-            <configuration>
-              <outputFile>${project.parent.basedir}/target/cached_classpath.txt</outputFile>
-              <excludeArtifactIds>jline,jruby-complete,hbase-shaded-client,hbase-shaded-client-byo-hadoop,hbase-shaded-mapreduce</excludeArtifactIds>
-            </configuration>
-          </execution>
-
-          <execution>
-            <!-- generates the file that will be used by the bin/hbase zkcli script in the dev env -->
-            <id>create-hbase-generated-classpath-jline</id>
-            <phase>test</phase>
-            <goals>
-              <goal>build-classpath</goal>
-            </goals>
-            <configuration>
-              <outputFile>${project.parent.basedir}/target/cached_classpath_jline.txt</outputFile>
-              <includeArtifactIds>jline</includeArtifactIds>
-            </configuration>
-          </execution>
-
-          <execution>
-            <!-- generates the file that will be used by the bin/hbase shell script in the dev env -->
-            <id>create-hbase-generated-classpath-jruby</id>
-            <phase>test</phase>
-            <goals>
-              <goal>build-classpath</goal>
-            </goals>
-            <configuration>
-              <outputFile>${project.parent.basedir}/target/cached_classpath_jruby.txt</outputFile>
-              <includeArtifactIds>jruby-complete</includeArtifactIds>
-            </configuration>
-          </execution>
-
-        <!--
-           Build an aggregation of our templated NOTICE file and the NOTICE files in our dependencies.
-           If MASSEMBLY-382 is fixed we could do this in the assembly
-           Currently relies on env, bash, find, and cat.
-        -->
-          <execution>
-            <!-- put all of the NOTICE files out of our dependencies -->
-            <id>unpack-dependency-notices</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <excludeTypes>pom</excludeTypes>
-              <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
-              <includes>**\/NOTICE,**\/NOTICE.txt</includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>${exec.maven.version}</version>
-        <executions>
-          <execution>
-            <id>concat-NOTICE-files</id>
-            <phase>package</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>env</executable>
-              <arguments>
-                <argument>bash</argument>
-                <argument>-c</argument>
-                <argument>cat maven-shared-archive-resources/META-INF/NOTICE \
-                  `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt`
-                </argument>
-              </arguments>
-              <outputFile>${project.build.directory}/NOTICE.aggregate</outputFile>
-              <workingDirectory>${project.build.directory}</workingDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- /end building aggregation of NOTICE files -->
-    </plugins>
-  </build>
   <dependencies>
     <!-- client artifacts for downstream use -->
     <dependency>
@@ -189,7 +47,7 @@
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-shaded-mapreduce</artifactId>
     </dependency>
-	<!-- Intra-project dependencies -->
+    <!-- Intra-project dependencies -->
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-it</artifactId>
@@ -258,16 +116,16 @@
       <artifactId>hbase-external-blockcache</artifactId>
     </dependency>
     <dependency>
-       <groupId>org.apache.hbase</groupId>
-       <artifactId>hbase-testing-util</artifactId>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-testing-util</artifactId>
     </dependency>
     <dependency>
-       <groupId>org.apache.hbase</groupId>
-       <artifactId>hbase-metrics-api</artifactId>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-metrics-api</artifactId>
     </dependency>
     <dependency>
-       <groupId>org.apache.hbase</groupId>
-       <artifactId>hbase-metrics</artifactId>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-metrics</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
@@ -278,9 +136,9 @@
       <artifactId>hbase-protocol-shaded</artifactId>
     </dependency>
     <dependency>
-       <groupId>org.apache.hbase</groupId>
-       <artifactId>hbase-resource-bundle</artifactId>
-       <optional>true</optional>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-resource-bundle</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -379,12 +237,151 @@
       <artifactId>log4j-1.2-api</artifactId>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <!-- licensing info from our dependencies -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>aggregate-licenses</id>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <properties>
+                <copyright-end-year>${build.year}</copyright-end-year>
+                <debug-print-included-work-info>${license.debug.print.included}</debug-print-included-work-info>
+                <bundled-dependencies>${license.bundles.dependencies}</bundled-dependencies>
+                <bundled-jquery>${license.bundles.jquery}</bundled-jquery>
+                <bundled-vega>${license.bundles.vega}</bundled-vega>
+                <bundled-logo>${license.bundles.logo}</bundled-logo>
+                <bundled-bootstrap>${license.bundles.bootstrap}</bundled-bootstrap>
+              </properties>
+              <resourceBundles>
+                <resourceBundle>${project.groupId}:hbase-resource-bundle:${project.version}</resourceBundle>
+              </resourceBundles>
+              <supplementalModelArtifacts>
+                <supplementalModelArtifact>${project.groupId}:hbase-resource-bundle:${project.version}</supplementalModelArtifact>
+              </supplementalModelArtifacts>
+              <supplementalModels>
+                <supplementalModel>supplemental-models.xml</supplementalModel>
+              </supplementalModels>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <!--Else will use hbase-assembly as final name.-->
+          <finalName>hbase-${project.version}</finalName>
+          <skipAssembly>false</skipAssembly>
+          <appendAssemblyId>true</appendAssemblyId>
+          <tarLongFileMode>posix</tarLongFileMode>
+          <descriptors>
+            <descriptor>${assembly.file}</descriptor>
+            <descriptor>src/main/assembly/client.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <!-- generates the file that will be used by the bin/hbase script in the dev env -->
+            <id>create-hbase-generated-classpath</id>
+            <goals>
+              <goal>build-classpath</goal>
+            </goals>
+            <phase>test</phase>
+            <configuration>
+              <outputFile>${project.parent.basedir}/target/cached_classpath.txt</outputFile>
+              <excludeArtifactIds>jline,jruby-complete,hbase-shaded-client,hbase-shaded-client-byo-hadoop,hbase-shaded-mapreduce</excludeArtifactIds>
+            </configuration>
+          </execution>
+
+          <execution>
+            <!-- generates the file that will be used by the bin/hbase zkcli script in the dev env -->
+            <id>create-hbase-generated-classpath-jline</id>
+            <goals>
+              <goal>build-classpath</goal>
+            </goals>
+            <phase>test</phase>
+            <configuration>
+              <outputFile>${project.parent.basedir}/target/cached_classpath_jline.txt</outputFile>
+              <includeArtifactIds>jline</includeArtifactIds>
+            </configuration>
+          </execution>
+
+          <execution>
+            <!-- generates the file that will be used by the bin/hbase shell script in the dev env -->
+            <id>create-hbase-generated-classpath-jruby</id>
+            <goals>
+              <goal>build-classpath</goal>
+            </goals>
+            <phase>test</phase>
+            <configuration>
+              <outputFile>${project.parent.basedir}/target/cached_classpath_jruby.txt</outputFile>
+              <includeArtifactIds>jruby-complete</includeArtifactIds>
+            </configuration>
+          </execution>
+
+          <!--
+           Build an aggregation of our templated NOTICE file and the NOTICE files in our dependencies.
+           If MASSEMBLY-382 is fixed we could do this in the assembly
+           Currently relies on env, bash, find, and cat.
+        -->
+          <execution>
+            <!-- put all of the NOTICE files out of our dependencies -->
+            <id>unpack-dependency-notices</id>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <excludeTypes>pom</excludeTypes>
+              <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
+              <includes>**\/NOTICE,**\/NOTICE.txt</includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>${exec.maven.version}</version>
+        <executions>
+          <execution>
+            <id>concat-NOTICE-files</id>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <executable>env</executable>
+              <arguments>
+                <argument>bash</argument>
+                <argument>-c</argument>
+                <argument>cat maven-shared-archive-resources/META-INF/NOTICE \
+                  `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt`</argument>
+              </arguments>
+              <outputFile>${project.build.directory}/NOTICE.aggregate</outputFile>
+              <workingDirectory>${project.build.directory}</workingDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- /end building aggregation of NOTICE files -->
+    </plugins>
+  </build>
   <profiles>
     <profile>
       <id>rsgroup</id>
       <activation>
         <property>
-            <name>!skip-rsgroup</name>
+          <name>!skip-rsgroup</name>
         </property>
       </activation>
       <dependencies>
@@ -392,18 +389,18 @@
           <groupId>org.apache.hbase</groupId>
           <artifactId>hbase-rsgroup</artifactId>
         </dependency>
-      <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <!-- Making it compile here so that it can be downloaded during packaging. -->
-      <!-- All other modules scope it as test or inherit test scope from parent pom.  -->
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.mockito</groupId>
+          <artifactId>mockito-core</artifactId>
+          <!-- Making it compile here so that it can be downloaded during packaging. -->
+          <!-- All other modules scope it as test or inherit test scope from parent pom.  -->
+          <scope>compile</scope>
+        </dependency>
+      </dependencies>
     </profile>
   </profiles>
 </project>
diff --git a/hbase-asyncfs/pom.xml b/hbase-asyncfs/pom.xml
index 26cab77a20f..3c1bda04903 100644
--- a/hbase-asyncfs/pom.xml
+++ b/hbase-asyncfs/pom.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
   /**
    * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +21,8 @@
   -->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>hbase-build-configuration</artifactId>
     <groupId>org.apache.hbase</groupId>
+    <artifactId>hbase-build-configuration</artifactId>
     <version>2.6.0-SNAPSHOT</version>
     <relativePath>../hbase-build-configuration</relativePath>
   </parent>
@@ -31,33 +30,6 @@
   <artifactId>hbase-asyncfs</artifactId>
   <name>Apache HBase - Asynchronous FileSystem</name>
   <description>HBase Asynchronous FileSystem Implementation for WAL</description>
-  <build>
-    <plugins>
-      <!-- Make a jar and put the sources in the jar -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <!--Make it so assembly:single does nothing in here-->
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>net.revelc.code</groupId>
-        <artifactId>warbucks-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <failOnViolation>true</failOnViolation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 
   <dependencies>
     <dependency>
@@ -169,6 +141,33 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <!-- Make a jar and put the sources in the jar -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>net.revelc.code</groupId>
+        <artifactId>warbucks-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <failOnViolation>true</failOnViolation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
   <profiles>
     <!-- Profiles for building against different hadoop versions -->
@@ -176,8 +175,9 @@
       <id>hadoop-2.0</id>
       <activation>
         <property>
-            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h2--><name>!hadoop.profile</name>
+          <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+          <!--h2-->
+          <name>!hadoop.profile</name>
         </property>
       </activation>
       <dependencies>
@@ -265,8 +265,7 @@
               <artifactId>lifecycle-mapping</artifactId>
               <configuration>
                 <lifecycleMappingMetadata>
-                  <pluginExecutions>
-                  </pluginExecutions>
+                  <pluginExecutions/>
                 </lifecycleMappingMetadata>
               </configuration>
             </plugin>
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
index 059ca00b02c..b88b32bdb81 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,10 +21,9 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.CompletableFuture;
-
-import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.util.CancelableProgressable;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.yetus.audience.InterfaceAudience;
 
 /**
  * Interface for asynchronous filesystem output stream.
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.java
index 5b713196d0b..a530ca4a2a0 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -47,9 +47,9 @@ public final class AsyncFSOutputHelper {
    * implementation for other {@link FileSystem} which wraps around a {@link FSDataOutputStream}.
    */
   public static AsyncFSOutput createOutput(FileSystem fs, Path f, boolean overwrite,
-      boolean createParent, short replication, long blockSize, EventLoopGroup eventLoopGroup,
-      Class<? extends Channel> channelClass, StreamSlowMonitor monitor)
-      throws IOException, CommonFSUtils.StreamLacksCapabilityException {
+    boolean createParent, short replication, long blockSize, EventLoopGroup eventLoopGroup,
+    Class<? extends Channel> channelClass, StreamSlowMonitor monitor)
+    throws IOException, CommonFSUtils.StreamLacksCapabilityException {
     if (fs instanceof DistributedFileSystem) {
       return FanOutOneBlockAsyncDFSOutputHelper.createOutput((DistributedFileSystem) fs, f,
         overwrite, createParent, replication, blockSize, eventLoopGroup, channelClass, monitor);
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
index f618158fdb3..8906f003bc8 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -22,9 +22,9 @@ import static org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputHel
 import static org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputHelper.completeFile;
 import static org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputHelper.endFileLease;
 import static org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputHelper.getStatus;
+import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY;
 import static org.apache.hbase.thirdparty.io.netty.handler.timeout.IdleState.READER_IDLE;
 import static org.apache.hbase.thirdparty.io.netty.handler.timeout.IdleState.WRITER_IDLE;
-import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY;
 
 import com.google.errorprone.annotations.RestrictedApi;
 import java.io.IOException;
@@ -41,7 +41,6 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.crypto.Encryptor;
 import org.apache.hadoop.fs.Path;
@@ -181,7 +180,10 @@ public class FanOutOneBlockAsyncDFSOutput implements AsyncFSOutput {
 
   // State for connections to DN
   private enum State {
-    STREAMING, CLOSING, BROKEN, CLOSED
+    STREAMING,
+    CLOSING,
+    BROKEN,
+    CLOSED
   }
 
   private volatile State state;
@@ -197,7 +199,7 @@ public class FanOutOneBlockAsyncDFSOutput implements AsyncFSOutput {
       if (c.unfinishedReplicas.remove(channel.id())) {
         long current = EnvironmentEdgeManager.currentTime();
         streamSlowMonitor.checkProcessTimeAndSpeed(datanodeInfoMap.get(channel), c.packetDataLen,
-            current - c.flushTimestamp, c.lastAckTimestamp, c.unfinishedReplicas.size());
+          current - c.flushTimestamp, c.lastAckTimestamp, c.unfinishedReplicas.size());
         c.lastAckTimestamp = current;
         if (c.unfinishedReplicas.isEmpty()) {
           // we need to remove first before complete the future. It is possible that after we
@@ -285,13 +287,13 @@ public class FanOutOneBlockAsyncDFSOutput implements AsyncFSOutput {
     protected void channelRead0(ChannelHandlerContext ctx, PipelineAckProto ack) throws Exception {
       Status reply = getStatus(ack);
       if (reply != Status.SUCCESS) {
-        failed(ctx.channel(), () -> new IOException("Bad response " + reply + " for block " +
-          block + " from datanode " + ctx.channel().remoteAddress()));
+        failed(ctx.channel(), () -> new IOException("Bad response " + reply + " for block " + block
+          + " from datanode " + ctx.channel().remoteAddress()));
         return;
       }
       if (PipelineAck.isRestartOOBStatus(reply)) {
-        failed(ctx.channel(), () -> new IOException("Restart response " + reply + " for block " +
-          block + " from datanode " + ctx.channel().remoteAddress()));
+        failed(ctx.channel(), () -> new IOException("Restart response " + reply + " for block "
+          + block + " from datanode " + ctx.channel().remoteAddress()));
         return;
       }
       if (ack.getSeqno() == HEART_BEAT_SEQNO) {
@@ -346,10 +348,10 @@ public class FanOutOneBlockAsyncDFSOutput implements AsyncFSOutput {
     }
   }
 
-  FanOutOneBlockAsyncDFSOutput(Configuration conf,DistributedFileSystem dfs,
-      DFSClient client, ClientProtocol namenode, String clientName, String src, long fileId,
-      LocatedBlock locatedBlock, Encryptor encryptor, Map<Channel, DatanodeInfo> datanodeInfoMap,
-      DataChecksum summer, ByteBufAllocator alloc, StreamSlowMonitor streamSlowMonitor) {
+  FanOutOneBlockAsyncDFSOutput(Configuration conf, DistributedFileSystem dfs, DFSClient client,
+    ClientProtocol namenode, String clientName, String src, long fileId, LocatedBlock locatedBlock,
+    Encryptor encryptor, Map<Channel, DatanodeInfo> datanodeInfoMap, DataChecksum summer,
+    ByteBufAllocator alloc, StreamSlowMonitor streamSlowMonitor) {
     this.conf = conf;
     this.dfs = dfs;
     this.client = client;
@@ -404,7 +406,7 @@ public class FanOutOneBlockAsyncDFSOutput implements AsyncFSOutput {
   }
 
   private void flushBuffer(CompletableFuture<Long> future, ByteBuf dataBuf,
-      long nextPacketOffsetInBlock, boolean syncBlock) {
+    long nextPacketOffsetInBlock, boolean syncBlock) {
     int dataLen = dataBuf.readableBytes();
     int chunkLen = summer.getBytesPerChecksum();
     int trailingPartialChunkLen = dataLen % chunkLen;
@@ -414,13 +416,13 @@ public class FanOutOneBlockAsyncDFSOutput implements AsyncFSOutput {
     summer.calculateChunkedSums(dataBuf.nioBuffer(), checksumBuf.nioBuffer(0, checksumLen));
     checksumBuf.writerIndex(checksumLen);
     PacketHeader header = new PacketHeader(4 + checksumLen + dataLen, nextPacketOffsetInBlock,
-        nextPacketSeqno, false, dataLen, syncBlock);
+      nextPacketSeqno, false, dataLen, syncBlock);
     int headerLen = header.getSerializedSize();
     ByteBuf headerBuf = alloc.buffer(headerLen);
     header.putInBuffer(headerBuf.nioBuffer(0, headerLen));
     headerBuf.writerIndex(headerLen);
-    Callback c = new Callback(future, nextPacketOffsetInBlock + dataLen,
-        datanodeInfoMap.keySet(), dataLen);
+    Callback c =
+      new Callback(future, nextPacketOffsetInBlock + dataLen, datanodeInfoMap.keySet(), dataLen);
     waitingAckQueue.addLast(c);
     // recheck again after we pushed the callback to queue
     if (state != State.STREAMING && waitingAckQueue.peekFirst() == c) {
@@ -430,7 +432,7 @@ public class FanOutOneBlockAsyncDFSOutput implements AsyncFSOutput {
       return;
     }
     // TODO: we should perhaps measure time taken per DN here;
-    //       we could collect statistics per DN, and/or exclude bad nodes in createOutput.
+    // we could collect statistics per DN, and/or exclude bad nodes in createOutput.
     datanodeInfoMap.keySet().forEach(ch -> {
       ch.write(headerBuf.retainedDuplicate());
       ch.write(checksumBuf.retainedDuplicate());
@@ -515,7 +517,7 @@ public class FanOutOneBlockAsyncDFSOutput implements AsyncFSOutput {
     }
     trailingPartialChunkLength = dataLen % summer.getBytesPerChecksum();
     ByteBuf newBuf = alloc.directBuffer(sendBufSizePRedictor.guess(dataLen))
-        .ensureWritable(trailingPartialChunkLength);
+      .ensureWritable(trailingPartialChunkLength);
     if (trailingPartialChunkLength != 0) {
       buf.readerIndex(dataLen - trailingPartialChunkLength).readBytes(newBuf,
         trailingPartialChunkLength);
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java
index 45ff1cb145f..3596438c153 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -116,7 +116,7 @@ import org.apache.hbase.thirdparty.io.netty.util.concurrent.Promise;
 @InterfaceAudience.Private
 public final class FanOutOneBlockAsyncDFSOutputHelper {
   private static final Logger LOG =
-      LoggerFactory.getLogger(FanOutOneBlockAsyncDFSOutputHelper.class);
+    LoggerFactory.getLogger(FanOutOneBlockAsyncDFSOutputHelper.class);
 
   private FanOutOneBlockAsyncDFSOutputHelper() {
   }
@@ -154,9 +154,8 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
   // helper class for creating files.
   private interface FileCreator {
     default HdfsFileStatus create(ClientProtocol instance, String src, FsPermission masked,
-        String clientName, EnumSetWritable<CreateFlag> flag, boolean createParent,
-        short replication, long blockSize, CryptoProtocolVersion[] supportedVersions)
-        throws Exception {
+      String clientName, EnumSetWritable<CreateFlag> flag, boolean createParent, short replication,
+      long blockSize, CryptoProtocolVersion[] supportedVersions) throws Exception {
       try {
         return (HdfsFileStatus) createObject(instance, src, masked, clientName, flag, createParent,
           replication, blockSize, supportedVersions);
@@ -170,8 +169,8 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
     };
 
     Object createObject(ClientProtocol instance, String src, FsPermission masked, String clientName,
-        EnumSetWritable<CreateFlag> flag, boolean createParent, short replication, long blockSize,
-        CryptoProtocolVersion[] supportedVersions) throws Exception;
+      EnumSetWritable<CreateFlag> flag, boolean createParent, short replication, long blockSize,
+      CryptoProtocolVersion[] supportedVersions) throws Exception;
   }
 
   private static final FileCreator FILE_CREATOR;
@@ -199,7 +198,7 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
 
   private static LeaseManager createLeaseManager() throws NoSuchMethodException {
     Method beginFileLeaseMethod =
-        DFSClient.class.getDeclaredMethod("beginFileLease", long.class, DFSOutputStream.class);
+      DFSClient.class.getDeclaredMethod("beginFileLease", long.class, DFSOutputStream.class);
     beginFileLeaseMethod.setAccessible(true);
     Method endFileLeaseMethod = DFSClient.class.getDeclaredMethod("endFileLease", long.class);
     endFileLeaseMethod.setAccessible(true);
@@ -227,13 +226,13 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
 
   private static FileCreator createFileCreator3_3() throws NoSuchMethodException {
     Method createMethod = ClientProtocol.class.getMethod("create", String.class, FsPermission.class,
-        String.class, EnumSetWritable.class, boolean.class, short.class, long.class,
-        CryptoProtocolVersion[].class, String.class, String.class);
+      String.class, EnumSetWritable.class, boolean.class, short.class, long.class,
+      CryptoProtocolVersion[].class, String.class, String.class);
 
     return (instance, src, masked, clientName, flag, createParent, replication, blockSize,
-        supportedVersions) -> {
+      supportedVersions) -> {
       return (HdfsFileStatus) createMethod.invoke(instance, src, masked, clientName, flag,
-          createParent, replication, blockSize, supportedVersions, null, null);
+        createParent, replication, blockSize, supportedVersions, null, null);
     };
   }
 
@@ -243,7 +242,7 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
       CryptoProtocolVersion[].class, String.class);
 
     return (instance, src, masked, clientName, flag, createParent, replication, blockSize,
-        supportedVersions) -> {
+      supportedVersions) -> {
       return (HdfsFileStatus) createMethod.invoke(instance, src, masked, clientName, flag,
         createParent, replication, blockSize, supportedVersions, null);
     };
@@ -255,7 +254,7 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
       CryptoProtocolVersion[].class);
 
     return (instance, src, masked, clientName, flag, createParent, replication, blockSize,
-        supportedVersions) -> {
+      supportedVersions) -> {
       return (HdfsFileStatus) createMethod.invoke(instance, src, masked, clientName, flag,
         createParent, replication, blockSize, supportedVersions);
     };
@@ -307,9 +306,9 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
       FILE_CREATOR = createFileCreator();
       SHOULD_REPLICATE_FLAG = loadShouldReplicateFlag();
     } catch (Exception e) {
-      String msg = "Couldn't properly initialize access to HDFS internals. Please " +
-          "update your WAL Provider to not make use of the 'asyncfs' provider. See " +
-          "HBASE-16110 for more information.";
+      String msg = "Couldn't properly initialize access to HDFS internals. Please "
+        + "update your WAL Provider to not make use of the 'asyncfs' provider. See "
+        + "HBASE-16110 for more information.";
       LOG.error(msg, e);
       throw new Error(msg, e);
     }
@@ -340,7 +339,7 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
   }
 
   private static void processWriteBlockResponse(Channel channel, DatanodeInfo dnInfo,
-      Promise<Channel> promise, int timeoutMs) {
+    Promise<Channel> promise, int timeoutMs) {
     channel.pipeline().addLast(new IdleStateHandler(timeoutMs, 0, 0, TimeUnit.MILLISECONDS),
       new ProtobufVarint32FrameDecoder(),
       new ProtobufDecoder(BlockOpResponseProto.getDefaultInstance()),
@@ -348,7 +347,7 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
 
         @Override
         protected void channelRead0(ChannelHandlerContext ctx, BlockOpResponseProto resp)
-            throws Exception {
+          throws Exception {
           Status pipelineStatus = resp.getStatus();
           if (PipelineAck.isRestartOOBStatus(pipelineStatus)) {
             throw new IOException("datanode " + dnInfo + " is restarting");
@@ -356,11 +355,11 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
           String logInfo = "ack with firstBadLink as " + resp.getFirstBadLink();
           if (resp.getStatus() != Status.SUCCESS) {
             if (resp.getStatus() == Status.ERROR_ACCESS_TOKEN) {
-              throw new InvalidBlockTokenException("Got access token error" + ", status message " +
-                  resp.getMessage() + ", " + logInfo);
+              throw new InvalidBlockTokenException("Got access token error" + ", status message "
+                + resp.getMessage() + ", " + logInfo);
             } else {
-              throw new IOException("Got error" + ", status=" + resp.getStatus().name() +
-                  ", status message " + resp.getMessage() + ", " + logInfo);
+              throw new IOException("Got error" + ", status=" + resp.getStatus().name()
+                + ", status message " + resp.getMessage() + ", " + logInfo);
             }
           }
           // success
@@ -387,7 +386,7 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
         public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
           if (evt instanceof IdleStateEvent && ((IdleStateEvent) evt).state() == READER_IDLE) {
             promise
-                .tryFailure(new IOException("Timeout(" + timeoutMs + "ms) waiting for response"));
+              .tryFailure(new IOException("Timeout(" + timeoutMs + "ms) waiting for response"));
           } else {
             super.userEventTriggered(ctx, evt);
           }
@@ -401,7 +400,7 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
   }
 
   private static void requestWriteBlock(Channel channel, StorageType storageType,
-      OpWriteBlockProto.Builder writeBlockProtoBuilder) throws IOException {
+    OpWriteBlockProto.Builder writeBlockProtoBuilder) throws IOException {
     OpWriteBlockProto proto =
       writeBlockProtoBuilder.setStorageType(PBHelperClient.convertStorageType(storageType)).build();
     int protoLen = proto.getSerializedSize();
@@ -414,9 +413,9 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
   }
 
   private static void initialize(Configuration conf, Channel channel, DatanodeInfo dnInfo,
-      StorageType storageType, OpWriteBlockProto.Builder writeBlockProtoBuilder, int timeoutMs,
-      DFSClient client, Token<BlockTokenIdentifier> accessToken, Promise<Channel> promise)
-      throws IOException {
+    StorageType storageType, OpWriteBlockProto.Builder writeBlockProtoBuilder, int timeoutMs,
+    DFSClient client, Token<BlockTokenIdentifier> accessToken, Promise<Channel> promise)
+    throws IOException {
     Promise<Void> saslPromise = channel.eventLoop().newPromise();
     trySaslNegotiate(conf, channel, dnInfo, timeoutMs, client, accessToken, saslPromise);
     saslPromise.addListener(new FutureListener<Void>() {
@@ -435,13 +434,13 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
   }
 
   private static List<Future<Channel>> connectToDataNodes(Configuration conf, DFSClient client,
-      String clientName, LocatedBlock locatedBlock, long maxBytesRcvd, long latestGS,
-      BlockConstructionStage stage, DataChecksum summer, EventLoopGroup eventLoopGroup,
-      Class<? extends Channel> channelClass) {
+    String clientName, LocatedBlock locatedBlock, long maxBytesRcvd, long latestGS,
+    BlockConstructionStage stage, DataChecksum summer, EventLoopGroup eventLoopGroup,
+    Class<? extends Channel> channelClass) {
     StorageType[] storageTypes = locatedBlock.getStorageTypes();
     DatanodeInfo[] datanodeInfos = locatedBlock.getLocations();
     boolean connectToDnViaHostname =
-        conf.getBoolean(DFS_CLIENT_USE_DN_HOSTNAME, DFS_CLIENT_USE_DN_HOSTNAME_DEFAULT);
+      conf.getBoolean(DFS_CLIENT_USE_DN_HOSTNAME, DFS_CLIENT_USE_DN_HOSTNAME_DEFAULT);
     int timeoutMs = conf.getInt(DFS_CLIENT_SOCKET_TIMEOUT_KEY, READ_TIMEOUT);
     ExtendedBlock blockCopy = new ExtendedBlock(locatedBlock.getBlock());
     blockCopy.setNumBytes(locatedBlock.getBlockSize());
@@ -450,11 +449,11 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
         .setToken(PBHelperClient.convert(locatedBlock.getBlockToken())))
       .setClientName(clientName).build();
     ChecksumProto checksumProto = DataTransferProtoUtil.toProto(summer);
-    OpWriteBlockProto.Builder writeBlockProtoBuilder = OpWriteBlockProto.newBuilder()
-        .setHeader(header).setStage(OpWriteBlockProto.BlockConstructionStage.valueOf(stage.name()))
-        .setPipelineSize(1).setMinBytesRcvd(locatedBlock.getBlock().getNumBytes())
-        .setMaxBytesRcvd(maxBytesRcvd).setLatestGenerationStamp(latestGS)
-        .setRequestedChecksum(checksumProto)
+    OpWriteBlockProto.Builder writeBlockProtoBuilder =
+      OpWriteBlockProto.newBuilder().setHeader(header)
+        .setStage(OpWriteBlockProto.BlockConstructionStage.valueOf(stage.name())).setPipelineSize(1)
+        .setMinBytesRcvd(locatedBlock.getBlock().getNumBytes()).setMaxBytesRcvd(maxBytesRcvd)
+        .setLatestGenerationStamp(latestGS).setRequestedChecksum(checksumProto)
         .setCachingStrategy(CachingStrategyProto.newBuilder().setDropBehind(true).build());
     List<Future<Channel>> futureList = new ArrayList<>(datanodeInfos.length);
     for (int i = 0; i < datanodeInfos.length; i++) {
@@ -464,26 +463,26 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
       futureList.add(promise);
       String dnAddr = dnInfo.getXferAddr(connectToDnViaHostname);
       new Bootstrap().group(eventLoopGroup).channel(channelClass)
-          .option(CONNECT_TIMEOUT_MILLIS, timeoutMs).handler(new ChannelInitializer<Channel>() {
+        .option(CONNECT_TIMEOUT_MILLIS, timeoutMs).handler(new ChannelInitializer<Channel>() {
 
-            @Override
-            protected void initChannel(Channel ch) throws Exception {
-              // we need to get the remote address of the channel so we can only move on after
-              // channel connected. Leave an empty implementation here because netty does not allow
-              // a null handler.
-            }
-          }).connect(NetUtils.createSocketAddr(dnAddr)).addListener(new ChannelFutureListener() {
-
-            @Override
-            public void operationComplete(ChannelFuture future) throws Exception {
-              if (future.isSuccess()) {
-                initialize(conf, future.channel(), dnInfo, storageType, writeBlockProtoBuilder,
-                  timeoutMs, client, locatedBlock.getBlockToken(), promise);
-              } else {
-                promise.tryFailure(future.cause());
-              }
+          @Override
+          protected void initChannel(Channel ch) throws Exception {
+            // we need to get the remote address of the channel so we can only move on after
+            // channel connected. Leave an empty implementation here because netty does not allow
+            // a null handler.
+          }
+        }).connect(NetUtils.createSocketAddr(dnAddr)).addListener(new ChannelFutureListener() {
+
+          @Override
+          public void operationComplete(ChannelFuture future) throws Exception {
+            if (future.isSuccess()) {
+              initialize(conf, future.channel(), dnInfo, storageType, writeBlockProtoBuilder,
+                timeoutMs, client, locatedBlock.getBlockToken(), promise);
+            } else {
+              promise.tryFailure(future.cause());
             }
-          });
+          }
+        });
     }
     return futureList;
   }
@@ -513,21 +512,21 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
   }
 
   private static FanOutOneBlockAsyncDFSOutput createOutput(DistributedFileSystem dfs, String src,
-      boolean overwrite, boolean createParent, short replication, long blockSize,
-      EventLoopGroup eventLoopGroup, Class<? extends Channel> channelClass,
-      StreamSlowMonitor monitor) throws IOException {
+    boolean overwrite, boolean createParent, short replication, long blockSize,
+    EventLoopGroup eventLoopGroup, Class<? extends Channel> channelClass, StreamSlowMonitor monitor)
+    throws IOException {
     Configuration conf = dfs.getConf();
     DFSClient client = dfs.getClient();
     String clientName = client.getClientName();
     ClientProtocol namenode = client.getNamenode();
-    int createMaxRetries = conf.getInt(ASYNC_DFS_OUTPUT_CREATE_MAX_RETRIES,
-      DEFAULT_ASYNC_DFS_OUTPUT_CREATE_MAX_RETRIES);
+    int createMaxRetries =
+      conf.getInt(ASYNC_DFS_OUTPUT_CREATE_MAX_RETRIES, DEFAULT_ASYNC_DFS_OUTPUT_CREATE_MAX_RETRIES);
     ExcludeDatanodeManager excludeDatanodeManager = monitor.getExcludeDatanodeManager();
     Set<DatanodeInfo> toExcludeNodes =
       new HashSet<>(excludeDatanodeManager.getExcludeDNs().keySet());
     for (int retry = 0;; retry++) {
       LOG.debug("When create output stream for {}, exclude list is {}, retry={}", src,
-          toExcludeNodes, retry);
+        toExcludeNodes, retry);
       HdfsFileStatus stat;
       try {
         stat = FILE_CREATOR.create(namenode, src,
@@ -616,14 +615,14 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
    * inside an {@link EventLoop}.
    */
   public static FanOutOneBlockAsyncDFSOutput createOutput(DistributedFileSystem dfs, Path f,
-      boolean overwrite, boolean createParent, short replication, long blockSize,
-      EventLoopGroup eventLoopGroup, Class<? extends Channel> channelClass,
-      final StreamSlowMonitor monitor) throws IOException {
+    boolean overwrite, boolean createParent, short replication, long blockSize,
+    EventLoopGroup eventLoopGroup, Class<? extends Channel> channelClass,
+    final StreamSlowMonitor monitor) throws IOException {
     return new FileSystemLinkResolver<FanOutOneBlockAsyncDFSOutput>() {
 
       @Override
       public FanOutOneBlockAsyncDFSOutput doCall(Path p)
-          throws IOException, UnresolvedLinkException {
+        throws IOException, UnresolvedLinkException {
         return createOutput(dfs, p.toUri().getPath(), overwrite, createParent, replication,
           blockSize, eventLoopGroup, channelClass, monitor);
       }
@@ -643,7 +642,7 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
   }
 
   static void completeFile(DFSClient client, ClientProtocol namenode, String src, String clientName,
-      ExtendedBlock block, long fileId) {
+    ExtendedBlock block, long fileId) {
     for (int retry = 0;; retry++) {
       try {
         if (namenode.complete(src, clientName, block, fileId)) {
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java
index 090b9b4a63f..89f386c8d64 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -104,7 +104,7 @@ import org.apache.hbase.thirdparty.io.netty.util.concurrent.Promise;
 @InterfaceAudience.Private
 public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
   private static final Logger LOG =
-      LoggerFactory.getLogger(FanOutOneBlockAsyncDFSOutputSaslHelper.class);
+    LoggerFactory.getLogger(FanOutOneBlockAsyncDFSOutputSaslHelper.class);
 
   private FanOutOneBlockAsyncDFSOutputSaslHelper() {
   }
@@ -129,21 +129,21 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
   private interface TransparentCryptoHelper {
 
     Encryptor createEncryptor(Configuration conf, FileEncryptionInfo feInfo, DFSClient client)
-        throws IOException;
+      throws IOException;
   }
 
   private static final TransparentCryptoHelper TRANSPARENT_CRYPTO_HELPER;
 
   private static SaslAdaptor createSaslAdaptor()
-      throws NoSuchFieldException, NoSuchMethodException {
+    throws NoSuchFieldException, NoSuchMethodException {
     Field saslPropsResolverField =
-        SaslDataTransferClient.class.getDeclaredField("saslPropsResolver");
+      SaslDataTransferClient.class.getDeclaredField("saslPropsResolver");
     saslPropsResolverField.setAccessible(true);
     Field trustedChannelResolverField =
-        SaslDataTransferClient.class.getDeclaredField("trustedChannelResolver");
+      SaslDataTransferClient.class.getDeclaredField("trustedChannelResolver");
     trustedChannelResolverField.setAccessible(true);
     Field fallbackToSimpleAuthField =
-        SaslDataTransferClient.class.getDeclaredField("fallbackToSimpleAuth");
+      SaslDataTransferClient.class.getDeclaredField("fallbackToSimpleAuth");
     fallbackToSimpleAuthField.setAccessible(true);
     return new SaslAdaptor() {
 
@@ -177,7 +177,7 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
   }
 
   private static TransparentCryptoHelper createTransparentCryptoHelperWithoutHDFS12396()
-      throws NoSuchMethodException {
+    throws NoSuchMethodException {
     Method decryptEncryptedDataEncryptionKeyMethod = DFSClient.class
       .getDeclaredMethod("decryptEncryptedDataEncryptionKey", FileEncryptionInfo.class);
     decryptEncryptedDataEncryptionKeyMethod.setAccessible(true);
@@ -185,7 +185,7 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
 
       @Override
       public Encryptor createEncryptor(Configuration conf, FileEncryptionInfo feInfo,
-          DFSClient client) throws IOException {
+        DFSClient client) throws IOException {
         try {
           KeyVersion decryptedKey =
             (KeyVersion) decryptEncryptedDataEncryptionKeyMethod.invoke(client, feInfo);
@@ -206,7 +206,7 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
   }
 
   private static TransparentCryptoHelper createTransparentCryptoHelperWithHDFS12396()
-      throws ClassNotFoundException, NoSuchMethodException {
+    throws ClassNotFoundException, NoSuchMethodException {
     Class<?> hdfsKMSUtilCls = Class.forName("org.apache.hadoop.hdfs.HdfsKMSUtil");
     Method decryptEncryptedDataEncryptionKeyMethod = hdfsKMSUtilCls.getDeclaredMethod(
       "decryptEncryptedDataEncryptionKey", FileEncryptionInfo.class, KeyProvider.class);
@@ -215,7 +215,7 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
 
       @Override
       public Encryptor createEncryptor(Configuration conf, FileEncryptionInfo feInfo,
-          DFSClient client) throws IOException {
+        DFSClient client) throws IOException {
         try {
           KeyVersion decryptedKey = (KeyVersion) decryptEncryptedDataEncryptionKeyMethod
             .invoke(null, feInfo, client.getKeyProvider());
@@ -236,12 +236,12 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
   }
 
   private static TransparentCryptoHelper createTransparentCryptoHelper()
-      throws NoSuchMethodException, ClassNotFoundException {
+    throws NoSuchMethodException, ClassNotFoundException {
     try {
       return createTransparentCryptoHelperWithoutHDFS12396();
     } catch (NoSuchMethodException e) {
-      LOG.debug("No decryptEncryptedDataEncryptionKey method in DFSClient," +
-        " should be hadoop version with HDFS-12396", e);
+      LOG.debug("No decryptEncryptedDataEncryptionKey method in DFSClient,"
+        + " should be hadoop version with HDFS-12396", e);
     }
     return createTransparentCryptoHelperWithHDFS12396();
   }
@@ -252,8 +252,8 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
       TRANSPARENT_CRYPTO_HELPER = createTransparentCryptoHelper();
     } catch (Exception e) {
       String msg = "Couldn't properly initialize access to HDFS internals. Please "
-          + "update your WAL Provider to not make use of the 'asyncfs' provider. See "
-          + "HBASE-16110 for more information.";
+        + "update your WAL Provider to not make use of the 'asyncfs' provider. See "
+        + "HBASE-16110 for more information.";
       LOG.error(msg, e);
       throw new Error(msg, e);
     }
@@ -324,8 +324,8 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
     private int step = 0;
 
     public SaslNegotiateHandler(Configuration conf, String username, char[] password,
-        Map<String, String> saslProps, int timeoutMs, Promise<Void> promise,
-        DFSClient dfsClient) throws SaslException {
+      Map<String, String> saslProps, int timeoutMs, Promise<Void> promise, DFSClient dfsClient)
+      throws SaslException {
       this.conf = conf;
       this.saslProps = saslProps;
       this.saslClient = Sasl.createSaslClient(new String[] { MECHANISM }, username, PROTOCOL,
@@ -355,8 +355,8 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
     }
 
     /**
-     * The asyncfs subsystem emulates a HDFS client by sending protobuf messages via netty.
-     * After Hadoop 3.3.0, the protobuf classes are relocated to org.apache.hadoop.thirdparty.protobuf.*.
+     * The asyncfs subsystem emulates a HDFS client by sending protobuf messages via netty. After
+     * Hadoop 3.3.0, the protobuf classes are relocated to org.apache.hadoop.thirdparty.protobuf.*.
      * Use Reflection to check which ones to use.
      */
     private static class BuilderPayloadSetter {
@@ -366,13 +366,11 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
       /**
        * Create a ByteString from byte array without copying (wrap), and then set it as the payload
        * for the builder.
-       *
        * @param builder builder for HDFS DataTransferEncryptorMessage.
-       * @param payload byte array of payload.
-       * @throws IOException
+       * @param payload byte array of payload. n
        */
-      static void wrapAndSetPayload(DataTransferEncryptorMessageProto.Builder builder, byte[] payload)
-        throws IOException {
+      static void wrapAndSetPayload(DataTransferEncryptorMessageProto.Builder builder,
+        byte[] payload) throws IOException {
         Object byteStringObject;
         try {
           // byteStringObject = new LiteralByteString(payload);
@@ -396,18 +394,18 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
         try {
           // See if it can load the relocated ByteString, which comes from hadoop-thirdparty.
           byteStringClass = Class.forName("org.apache.hadoop.thirdparty.protobuf.ByteString");
-          LOG.debug("Found relocated ByteString class from hadoop-thirdparty." +
-            " Assuming this is Hadoop 3.3.0+.");
+          LOG.debug("Found relocated ByteString class from hadoop-thirdparty."
+            + " Assuming this is Hadoop 3.3.0+.");
         } catch (ClassNotFoundException e) {
-          LOG.debug("Did not find relocated ByteString class from hadoop-thirdparty." +
-            " Assuming this is below Hadoop 3.3.0", e);
+          LOG.debug("Did not find relocated ByteString class from hadoop-thirdparty."
+            + " Assuming this is below Hadoop 3.3.0", e);
         }
 
         // LiteralByteString is a package private class in protobuf. Make it accessible.
         Class<?> literalByteStringClass;
         try {
-          literalByteStringClass = Class.forName(
-            "org.apache.hadoop.thirdparty.protobuf.ByteString$LiteralByteString");
+          literalByteStringClass =
+            Class.forName("org.apache.hadoop.thirdparty.protobuf.ByteString$LiteralByteString");
           LOG.debug("Shaded LiteralByteString from hadoop-thirdparty is found.");
         } catch (ClassNotFoundException e) {
           try {
@@ -435,9 +433,9 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
     }
 
     private void sendSaslMessage(ChannelHandlerContext ctx, byte[] payload,
-        List<CipherOption> options) throws IOException {
+      List<CipherOption> options) throws IOException {
       DataTransferEncryptorMessageProto.Builder builder =
-          DataTransferEncryptorMessageProto.newBuilder();
+        DataTransferEncryptorMessageProto.newBuilder();
       builder.setStatus(DataTransferEncryptorStatus.SUCCESS);
       if (payload != null) {
         BuilderPayloadSetter.wrapAndSetPayload(builder, payload);
@@ -486,7 +484,7 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
 
     private boolean requestedQopContainsPrivacy() {
       Set<String> requestedQop =
-          ImmutableSet.copyOf(Arrays.asList(saslProps.get(Sasl.QOP).split(",")));
+        ImmutableSet.copyOf(Arrays.asList(saslProps.get(Sasl.QOP).split(",")));
       return requestedQop.contains("auth-conf");
     }
 
@@ -495,15 +493,14 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
         throw new IOException("Failed to complete SASL handshake");
       }
       Set<String> requestedQop =
-          ImmutableSet.copyOf(Arrays.asList(saslProps.get(Sasl.QOP).split(",")));
+        ImmutableSet.copyOf(Arrays.asList(saslProps.get(Sasl.QOP).split(",")));
       String negotiatedQop = getNegotiatedQop();
       LOG.debug(
         "Verifying QOP, requested QOP = " + requestedQop + ", negotiated QOP = " + negotiatedQop);
       if (!requestedQop.contains(negotiatedQop)) {
         throw new IOException(String.format("SASL handshake completed, but "
-            + "channel does not have acceptable quality of protection, "
-            + "requested = %s, negotiated = %s",
-          requestedQop, negotiatedQop));
+          + "channel does not have acceptable quality of protection, "
+          + "requested = %s, negotiated = %s", requestedQop, negotiatedQop));
       }
     }
 
@@ -522,13 +519,13 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
         outKey = saslClient.unwrap(outKey, 0, outKey.length);
       }
       return new CipherOption(option.getCipherSuite(), inKey, option.getInIv(), outKey,
-          option.getOutIv());
+        option.getOutIv());
     }
 
     private CipherOption getCipherOption(DataTransferEncryptorMessageProto proto,
-        boolean isNegotiatedQopPrivacy, SaslClient saslClient) throws IOException {
+      boolean isNegotiatedQopPrivacy, SaslClient saslClient) throws IOException {
       List<CipherOption> cipherOptions =
-          PBHelperClient.convertCipherOptionProtos(proto.getCipherOptionList());
+        PBHelperClient.convertCipherOptionProtos(proto.getCipherOptionList());
       if (cipherOptions == null || cipherOptions.isEmpty()) {
         return null;
       }
@@ -558,7 +555,7 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
             assert response == null;
             checkSaslComplete();
             CipherOption cipherOption =
-                getCipherOption(proto, isNegotiatedQopPrivacy(), saslClient);
+              getCipherOption(proto, isNegotiatedQopPrivacy(), saslClient);
             ChannelPipeline p = ctx.pipeline();
             while (p.first() != null) {
               p.removeFirst();
@@ -639,7 +636,7 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
 
     @Override
     public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
-        throws Exception {
+      throws Exception {
       if (msg instanceof ByteBuf) {
         ByteBuf buf = (ByteBuf) msg;
         cBuf.addComponent(buf);
@@ -676,7 +673,7 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
     private final Decryptor decryptor;
 
     public DecryptHandler(CryptoCodec codec, byte[] key, byte[] iv)
-        throws GeneralSecurityException, IOException {
+      throws GeneralSecurityException, IOException {
       this.decryptor = codec.createDecryptor();
       this.decryptor.init(key, Arrays.copyOf(iv, iv.length));
     }
@@ -709,14 +706,14 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
     private final Encryptor encryptor;
 
     public EncryptHandler(CryptoCodec codec, byte[] key, byte[] iv)
-        throws GeneralSecurityException, IOException {
+      throws GeneralSecurityException, IOException {
       this.encryptor = codec.createEncryptor();
       this.encryptor.init(key, Arrays.copyOf(iv, iv.length));
     }
 
     @Override
     protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf msg, boolean preferDirect)
-        throws Exception {
+      throws Exception {
       if (preferDirect) {
         return ctx.alloc().directBuffer(msg.readableBytes());
       } else {
@@ -747,7 +744,7 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
 
   private static String getUserNameFromEncryptionKey(DataEncryptionKey encryptionKey) {
     return encryptionKey.keyId + NAME_DELIMITER + encryptionKey.blockPoolId + NAME_DELIMITER
-        + Base64.getEncoder().encodeToString(encryptionKey.nonce);
+      + Base64.getEncoder().encodeToString(encryptionKey.nonce);
   }
 
   private static char[] encryptionKeyToPassword(byte[] encryptionKey) {
@@ -771,26 +768,26 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
   }
 
   private static void doSaslNegotiation(Configuration conf, Channel channel, int timeoutMs,
-      String username, char[] password, Map<String, String> saslProps, Promise<Void> saslPromise,
-      DFSClient dfsClient) {
+    String username, char[] password, Map<String, String> saslProps, Promise<Void> saslPromise,
+    DFSClient dfsClient) {
     try {
       channel.pipeline().addLast(new IdleStateHandler(timeoutMs, 0, 0, TimeUnit.MILLISECONDS),
         new ProtobufVarint32FrameDecoder(),
         new ProtobufDecoder(DataTransferEncryptorMessageProto.getDefaultInstance()),
         new SaslNegotiateHandler(conf, username, password, saslProps, timeoutMs, saslPromise,
-            dfsClient));
+          dfsClient));
     } catch (SaslException e) {
       saslPromise.tryFailure(e);
     }
   }
 
   static void trySaslNegotiate(Configuration conf, Channel channel, DatanodeInfo dnInfo,
-      int timeoutMs, DFSClient client, Token<BlockTokenIdentifier> accessToken,
-      Promise<Void> saslPromise) throws IOException {
+    int timeoutMs, DFSClient client, Token<BlockTokenIdentifier> accessToken,
+    Promise<Void> saslPromise) throws IOException {
     SaslDataTransferClient saslClient = client.getSaslDataTransferClient();
     SaslPropertiesResolver saslPropsResolver = SASL_ADAPTOR.getSaslPropsResolver(saslClient);
     TrustedChannelResolver trustedChannelResolver =
-        SASL_ADAPTOR.getTrustedChannelResolver(saslClient);
+      SASL_ADAPTOR.getTrustedChannelResolver(saslClient);
     AtomicBoolean fallbackToSimpleAuth = SASL_ADAPTOR.getFallbackToSimpleAuth(saslClient);
     InetAddress addr = ((InetSocketAddress) channel.remoteAddress()).getAddress();
     if (trustedChannelResolver.isTrusted() || trustedChannelResolver.isTrusted(addr)) {
@@ -805,24 +802,23 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
       }
       doSaslNegotiation(conf, channel, timeoutMs, getUserNameFromEncryptionKey(encryptionKey),
         encryptionKeyToPassword(encryptionKey.encryptionKey),
-        createSaslPropertiesForEncryption(encryptionKey.encryptionAlgorithm), saslPromise,
-          client);
+        createSaslPropertiesForEncryption(encryptionKey.encryptionAlgorithm), saslPromise, client);
     } else if (!UserGroupInformation.isSecurityEnabled()) {
       if (LOG.isDebugEnabled()) {
         LOG.debug("SASL client skipping handshake in unsecured configuration for addr = " + addr
-            + ", datanodeId = " + dnInfo);
+          + ", datanodeId = " + dnInfo);
       }
       saslPromise.trySuccess(null);
     } else if (dnInfo.getXferPort() < 1024) {
       if (LOG.isDebugEnabled()) {
         LOG.debug("SASL client skipping handshake in secured configuration with "
-            + "privileged port for addr = " + addr + ", datanodeId = " + dnInfo);
+          + "privileged port for addr = " + addr + ", datanodeId = " + dnInfo);
       }
       saslPromise.trySuccess(null);
     } else if (fallbackToSimpleAuth != null && fallbackToSimpleAuth.get()) {
       if (LOG.isDebugEnabled()) {
         LOG.debug("SASL client skipping handshake in secured configuration with "
-            + "unsecured cluster for addr = " + addr + ", datanodeId = " + dnInfo);
+          + "unsecured cluster for addr = " + addr + ", datanodeId = " + dnInfo);
       }
       saslPromise.trySuccess(null);
     } else if (saslPropsResolver != null) {
@@ -832,21 +828,21 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper {
       }
       doSaslNegotiation(conf, channel, timeoutMs, buildUsername(accessToken),
         buildClientPassword(accessToken), saslPropsResolver.getClientProperties(addr), saslPromise,
-          client);
+        client);
     } else {
       // It's a secured cluster using non-privileged ports, but no SASL. The only way this can
       // happen is if the DataNode has ignore.secure.ports.for.testing configured, so this is a rare
       // edge case.
       if (LOG.isDebugEnabled()) {
         LOG.debug("SASL client skipping handshake in secured configuration with no SASL "
-            + "protection configured for addr = " + addr + ", datanodeId = " + dnInfo);
+          + "protection configured for addr = " + addr + ", datanodeId = " + dnInfo);
       }
       saslPromise.trySuccess(null);
     }
   }
 
   static Encryptor createEncryptor(Configuration conf, HdfsFileStatus stat, DFSClient client)
-      throws IOException {
+    throws IOException {
     FileEncryptionInfo feInfo = stat.getFileEncryptionInfo();
     if (feInfo == null) {
       return null;
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/ProtobufDecoder.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/ProtobufDecoder.java
index 3be9a2e49c1..a0b5cc00841 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/ProtobufDecoder.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/ProtobufDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -17,33 +17,29 @@
  */
 package org.apache.hadoop.hbase.io.asyncfs;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.hbase.thirdparty.io.netty.buffer.ByteBuf;
 import org.apache.hbase.thirdparty.io.netty.buffer.ByteBufUtil;
 import org.apache.hbase.thirdparty.io.netty.channel.ChannelHandlerContext;
 import org.apache.hbase.thirdparty.io.netty.handler.codec.MessageToMessageDecoder;
 import org.apache.hbase.thirdparty.io.netty.util.internal.ObjectUtil;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
 
 /**
- * Modified based on io.netty.handler.codec.protobuf.ProtobufDecoder.
- * The Netty's ProtobufDecode supports unshaded protobuf messages (com.google.protobuf).
- *
- * Hadoop 3.3.0 and above relocates protobuf classes to a shaded jar (hadoop-thirdparty), and
- * so we must use reflection to detect which one (relocated or not) to use.
- *
- * Do not use this to process HBase's shaded protobuf messages. This is meant to process the
- * protobuf messages in HDFS for the asyncfs use case.
- * */
+ * Modified based on io.netty.handler.codec.protobuf.ProtobufDecoder. The Netty's ProtobufDecode
+ * supports unshaded protobuf messages (com.google.protobuf). Hadoop 3.3.0 and above relocates
+ * protobuf classes to a shaded jar (hadoop-thirdparty), and so we must use reflection to detect
+ * which one (relocated or not) to use. Do not use this to process HBase's shaded protobuf messages.
+ * This is meant to process the protobuf messages in HDFS for the asyncfs use case.
+ */
 @InterfaceAudience.Private
 public class ProtobufDecoder extends MessageToMessageDecoder<ByteBuf> {
-  private static final Logger LOG =
-    LoggerFactory.getLogger(ProtobufDecoder.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ProtobufDecoder.class);
 
   private static Class<?> protobufMessageLiteClass = null;
   private static Class<?> protobufMessageLiteBuilderClass = null;
@@ -60,23 +56,22 @@ public class ProtobufDecoder extends MessageToMessageDecoder<ByteBuf> {
   private Object parser;
   private Object builder;
 
-
   public ProtobufDecoder(Object prototype) {
     try {
-      Method getDefaultInstanceForTypeMethod = protobufMessageLiteClass.getMethod(
-        "getDefaultInstanceForType");
-      Object prototype1 = getDefaultInstanceForTypeMethod
-        .invoke(ObjectUtil.checkNotNull(prototype, "prototype"));
+      Method getDefaultInstanceForTypeMethod =
+        protobufMessageLiteClass.getMethod("getDefaultInstanceForType");
+      Object prototype1 =
+        getDefaultInstanceForTypeMethod.invoke(ObjectUtil.checkNotNull(prototype, "prototype"));
 
       // parser = prototype.getParserForType()
       parser = getParserForTypeMethod.invoke(prototype1);
-      parseFromMethod = parser.getClass().getMethod(
-        "parseFrom", byte[].class, int.class, int.class);
+      parseFromMethod =
+        parser.getClass().getMethod("parseFrom", byte[].class, int.class, int.class);
 
       // builder = prototype.newBuilderForType();
       builder = newBuilderForTypeMethod.invoke(prototype1);
-      mergeFromMethod = builder.getClass().getMethod(
-        "mergeFrom", byte[].class, int.class, int.class);
+      mergeFromMethod =
+        builder.getClass().getMethod("mergeFrom", byte[].class, int.class, int.class);
 
       // All protobuf message builders inherits from MessageLite.Builder
       buildMethod = protobufMessageLiteBuilderClass.getDeclaredMethod("build");
@@ -88,8 +83,7 @@ public class ProtobufDecoder extends MessageToMessageDecoder<ByteBuf> {
     }
   }
 
-  protected void decode(
-    ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception {
+  protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception {
     int length = msg.readableBytes();
     byte[] array;
     int offset;
@@ -122,8 +116,8 @@ public class ProtobufDecoder extends MessageToMessageDecoder<ByteBuf> {
 
     try {
       protobufMessageLiteClass = Class.forName("org.apache.hadoop.thirdparty.protobuf.MessageLite");
-      protobufMessageLiteBuilderClass = Class.forName(
-        "org.apache.hadoop.thirdparty.protobuf.MessageLite$Builder");
+      protobufMessageLiteBuilderClass =
+        Class.forName("org.apache.hadoop.thirdparty.protobuf.MessageLite$Builder");
       LOG.debug("Hadoop 3.3 and above shades protobuf.");
     } catch (ClassNotFoundException e) {
       LOG.debug("Hadoop 3.2 and below use unshaded protobuf.", e);
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/SendBufSizePredictor.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/SendBufSizePredictor.java
index 2f652440e38..d5dbfb02abc 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/SendBufSizePredictor.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/SendBufSizePredictor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
index c7cc1fcfcb4..0297285b93e 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.io.ByteArrayOutputStream;
@@ -50,7 +49,7 @@ public class WrapperAsyncFSOutput implements AsyncFSOutput {
   public WrapperAsyncFSOutput(Path file, FSDataOutputStream out) {
     this.out = out;
     this.executor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setDaemon(true)
-        .setNameFormat("AsyncFSOutputFlusher-" + file.toString().replace("%", "%%")).build());
+      .setNameFormat("AsyncFSOutputFlusher-" + file.toString().replace("%", "%%")).build());
   }
 
   @Override
@@ -95,8 +94,8 @@ public class WrapperAsyncFSOutput implements AsyncFSOutput {
       }
       long pos = out.getPos();
       /**
-       * This flush0 method could only be called by single thread, so here we could
-       * safely overwrite without any synchronization.
+       * This flush0 method could only be called by single thread, so here we could safely overwrite
+       * without any synchronization.
        */
       this.syncedLength = pos;
       future.complete(pos);
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/monitor/ExcludeDatanodeManager.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/monitor/ExcludeDatanodeManager.java
index 80748cad609..61f75582a1c 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/monitor/ExcludeDatanodeManager.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/monitor/ExcludeDatanodeManager.java
@@ -56,24 +56,23 @@ public class ExcludeDatanodeManager implements ConfigurationObserver {
   private final int maxExcludeDNCount;
   private final Configuration conf;
   // This is a map of providerId->StreamSlowMonitor
-  private final Map<String, StreamSlowMonitor> streamSlowMonitors =
-    new ConcurrentHashMap<>(1);
+  private final Map<String, StreamSlowMonitor> streamSlowMonitors = new ConcurrentHashMap<>(1);
 
   public ExcludeDatanodeManager(Configuration conf) {
     this.conf = conf;
     this.maxExcludeDNCount = conf.getInt(WAL_MAX_EXCLUDE_SLOW_DATANODE_COUNT_KEY,
       DEFAULT_WAL_MAX_EXCLUDE_SLOW_DATANODE_COUNT);
     this.excludeDNsCache = CacheBuilder.newBuilder()
-      .expireAfterWrite(this.conf.getLong(WAL_EXCLUDE_DATANODE_TTL_KEY,
-        DEFAULT_WAL_EXCLUDE_DATANODE_TTL), TimeUnit.HOURS)
-      .maximumSize(this.maxExcludeDNCount)
-      .build();
+      .expireAfterWrite(
+        this.conf.getLong(WAL_EXCLUDE_DATANODE_TTL_KEY, DEFAULT_WAL_EXCLUDE_DATANODE_TTL),
+        TimeUnit.HOURS)
+      .maximumSize(this.maxExcludeDNCount).build();
   }
 
   /**
    * Try to add a datanode to the regionserver excluding cache
    * @param datanodeInfo the datanode to be added to the excluded cache
-   * @param cause the cause that the datanode is hope to be excluded
+   * @param cause        the cause that the datanode is hope to be excluded
    * @return True if the datanode is added to the regionserver excluding cache, false otherwise
    */
   public boolean tryAddExcludeDN(DatanodeInfo datanodeInfo, String cause) {
@@ -85,15 +84,15 @@ public class ExcludeDatanodeManager implements ConfigurationObserver {
         datanodeInfo, cause, excludeDNsCache.size());
       return true;
     }
-    LOG.debug("Try add datanode {} to exclude cache by [{}] failed, "
-        + "current exclude DNs are {}", datanodeInfo, cause, getExcludeDNs().keySet());
+    LOG.debug(
+      "Try add datanode {} to exclude cache by [{}] failed, " + "current exclude DNs are {}",
+      datanodeInfo, cause, getExcludeDNs().keySet());
     return false;
   }
 
   public StreamSlowMonitor getStreamSlowMonitor(String name) {
     String key = name == null || name.isEmpty() ? "defaultMonitorName" : name;
-    return streamSlowMonitors
-      .computeIfAbsent(key, k -> new StreamSlowMonitor(conf, key, this));
+    return streamSlowMonitors.computeIfAbsent(key, k -> new StreamSlowMonitor(conf, key, this));
   }
 
   public Map<DatanodeInfo, Long> getExcludeDNs() {
@@ -105,10 +104,12 @@ public class ExcludeDatanodeManager implements ConfigurationObserver {
     for (StreamSlowMonitor monitor : streamSlowMonitors.values()) {
       monitor.onConfigurationChange(conf);
     }
-    this.excludeDNsCache = CacheBuilder.newBuilder().expireAfterWrite(
-      this.conf.getLong(WAL_EXCLUDE_DATANODE_TTL_KEY, DEFAULT_WAL_EXCLUDE_DATANODE_TTL),
-      TimeUnit.HOURS).maximumSize(this.conf
-      .getInt(WAL_MAX_EXCLUDE_SLOW_DATANODE_COUNT_KEY, DEFAULT_WAL_MAX_EXCLUDE_SLOW_DATANODE_COUNT))
+    this.excludeDNsCache = CacheBuilder.newBuilder()
+      .expireAfterWrite(
+        this.conf.getLong(WAL_EXCLUDE_DATANODE_TTL_KEY, DEFAULT_WAL_EXCLUDE_DATANODE_TTL),
+        TimeUnit.HOURS)
+      .maximumSize(this.conf.getInt(WAL_MAX_EXCLUDE_SLOW_DATANODE_COUNT_KEY,
+        DEFAULT_WAL_MAX_EXCLUDE_SLOW_DATANODE_COUNT))
       .build();
   }
 }
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/monitor/StreamSlowMonitor.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/monitor/StreamSlowMonitor.java
index 73cce189574..c415706aa6a 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/monitor/StreamSlowMonitor.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/monitor/StreamSlowMonitor.java
@@ -38,18 +38,16 @@ import org.apache.hbase.thirdparty.com.google.common.cache.CacheLoader;
 import org.apache.hbase.thirdparty.com.google.common.cache.LoadingCache;
 
 /**
- * Class for monitor the wal file flush performance.
- * Each active wal file has a StreamSlowMonitor.
+ * Class for monitor the wal file flush performance. Each active wal file has a StreamSlowMonitor.
  */
 @InterfaceAudience.Private
 public class StreamSlowMonitor implements ConfigurationObserver {
   private static final Logger LOG = LoggerFactory.getLogger(StreamSlowMonitor.class);
 
   /**
-   * Configure for the min count for a datanode detected slow.
-   * If a datanode is detected slow times up to this count, then it will be added to the exclude
-   * datanode cache by {@link ExcludeDatanodeManager#tryAddExcludeDN(DatanodeInfo, String)}
-   * of this regionsever.
+   * Configure for the min count for a datanode detected slow. If a datanode is detected slow times
+   * up to this count, then it will be added to the exclude datanode cache by
+   * {@link ExcludeDatanodeManager#tryAddExcludeDN(DatanodeInfo, String)} of this regionsever.
    */
   private static final String WAL_SLOW_DETECT_MIN_COUNT_KEY =
     "hbase.regionserver.async.wal.min.slow.detect.count";
@@ -63,9 +61,9 @@ public class StreamSlowMonitor implements ConfigurationObserver {
   private static final long DEFAULT_WAL_SLOW_DETECT_DATA_TTL = 10 * 60 * 1000; // 10min in ms
 
   /**
-   * Configure for the speed check of packet min length.
-   * For packets whose data length smaller than this value, check slow by processing time.
-   * While for packets whose data length larger than this value, check slow by flushing speed.
+   * Configure for the speed check of packet min length. For packets whose data length smaller than
+   * this value, check slow by processing time. While for packets whose data length larger than this
+   * value, check slow by flushing speed.
    */
   private static final String DATANODE_PACKET_FLUSH_CHECK_SPEED_MIN_DATA_LENGTH_KEY =
     "hbase.regionserver.async.wal.datanode.slow.check.speed.packet.data.length.min";
@@ -73,8 +71,8 @@ public class StreamSlowMonitor implements ConfigurationObserver {
   private static final long DEFAULT_DATANODE_PACKET_FLUSH_CHECK_SPEED_MIN_DATA_LENGTH = 64 * 1024;
 
   /**
-   * Configure for the slow packet process time, a duration from send to ACK.
-   * The processing time check is for packets that data length smaller than
+   * Configure for the slow packet process time, a duration from send to ACK. The processing time
+   * check is for packets that data length smaller than
    * {@link StreamSlowMonitor#DATANODE_PACKET_FLUSH_CHECK_SPEED_MIN_DATA_LENGTH_KEY}
    */
   public static final String DATANODE_SLOW_PACKET_PROCESS_TIME_KEY =
@@ -105,15 +103,16 @@ public class StreamSlowMonitor implements ConfigurationObserver {
   private long minLengthForSpeedCheck;
 
   public StreamSlowMonitor(Configuration conf, String name,
-      ExcludeDatanodeManager excludeDatanodeManager) {
+    ExcludeDatanodeManager excludeDatanodeManager) {
     setConf(conf);
     this.name = name;
     this.excludeDatanodeManager = excludeDatanodeManager;
     this.datanodeSlowDataQueue = CacheBuilder.newBuilder()
       .maximumSize(conf.getInt(WAL_MAX_EXCLUDE_SLOW_DATANODE_COUNT_KEY,
         DEFAULT_WAL_MAX_EXCLUDE_SLOW_DATANODE_COUNT))
-      .expireAfterWrite(conf.getLong(WAL_EXCLUDE_DATANODE_TTL_KEY,
-        DEFAULT_WAL_EXCLUDE_DATANODE_TTL), TimeUnit.HOURS)
+      .expireAfterWrite(
+        conf.getLong(WAL_EXCLUDE_DATANODE_TTL_KEY, DEFAULT_WAL_EXCLUDE_DATANODE_TTL),
+        TimeUnit.HOURS)
       .build(new CacheLoader<DatanodeInfo, Deque<PacketAckData>>() {
         @Override
         public Deque<PacketAckData> load(DatanodeInfo key) throws Exception {
@@ -129,30 +128,33 @@ public class StreamSlowMonitor implements ConfigurationObserver {
 
   /**
    * Check if the packet process time shows that the relevant datanode is a slow node.
-   * @param datanodeInfo the datanode that processed the packet
-   * @param packetDataLen the data length of the packet (in bytes)
-   * @param processTimeMs the process time (in ms) of the packet on the datanode,
+   * @param datanodeInfo     the datanode that processed the packet
+   * @param packetDataLen    the data length of the packet (in bytes)
+   * @param processTimeMs    the process time (in ms) of the packet on the datanode,
    * @param lastAckTimestamp the last acked timestamp of the packet on another datanode
-   * @param unfinished if the packet is unfinished flushed to the datanode replicas
+   * @param unfinished       if the packet is unfinished flushed to the datanode replicas
    */
   public void checkProcessTimeAndSpeed(DatanodeInfo datanodeInfo, long packetDataLen,
-      long processTimeMs, long lastAckTimestamp, int unfinished) {
+    long processTimeMs, long lastAckTimestamp, int unfinished) {
     long current = EnvironmentEdgeManager.currentTime();
     // Here are two conditions used to determine whether a datanode is slow,
     // 1. For small packet, we just have a simple time limit, without considering
     // the size of the packet.
     // 2. For large packet, we will calculate the speed, and check if the speed is too slow.
-    boolean slow = (packetDataLen <= minLengthForSpeedCheck && processTimeMs > slowPacketAckMs) || (
-      packetDataLen > minLengthForSpeedCheck
+    boolean slow = (packetDataLen <= minLengthForSpeedCheck && processTimeMs > slowPacketAckMs)
+      || (packetDataLen > minLengthForSpeedCheck
         && (double) packetDataLen / processTimeMs < minPacketFlushSpeedKBs);
     if (slow) {
       // Check if large diff ack timestamp between replicas,
       // should try to avoid misjudgments that caused by GC STW.
-      if ((lastAckTimestamp > 0 && current - lastAckTimestamp > slowPacketAckMs / 2) || (
-          lastAckTimestamp <= 0 && unfinished == 0)) {
-        LOG.info("Slow datanode: {}, data length={}, duration={}ms, unfinishedReplicas={}, "
-            + "lastAckTimestamp={}, monitor name: {}", datanodeInfo, packetDataLen, processTimeMs,
-          unfinished, lastAckTimestamp, this.name);
+      if (
+        (lastAckTimestamp > 0 && current - lastAckTimestamp > slowPacketAckMs / 2)
+          || (lastAckTimestamp <= 0 && unfinished == 0)
+      ) {
+        LOG.info(
+          "Slow datanode: {}, data length={}, duration={}ms, unfinishedReplicas={}, "
+            + "lastAckTimestamp={}, monitor name: {}",
+          datanodeInfo, packetDataLen, processTimeMs, unfinished, lastAckTimestamp, this.name);
         if (addSlowAckData(datanodeInfo, packetDataLen, processTimeMs)) {
           excludeDatanodeManager.tryAddExcludeDN(datanodeInfo, "slow packet ack");
         }
@@ -168,8 +170,10 @@ public class StreamSlowMonitor implements ConfigurationObserver {
   private boolean addSlowAckData(DatanodeInfo datanodeInfo, long dataLength, long processTime) {
     Deque<PacketAckData> slowDNQueue = datanodeSlowDataQueue.getUnchecked(datanodeInfo);
     long current = EnvironmentEdgeManager.currentTime();
-    while (!slowDNQueue.isEmpty() && (current - slowDNQueue.getFirst().getTimestamp() > slowDataTtl
-      || slowDNQueue.size() >= minSlowDetectCount)) {
+    while (
+      !slowDNQueue.isEmpty() && (current - slowDNQueue.getFirst().getTimestamp() > slowDataTtl
+        || slowDNQueue.size() >= minSlowDetectCount)
+    ) {
       slowDNQueue.removeFirst();
     }
     slowDNQueue.addLast(new PacketAckData(dataLength, processTime));
@@ -177,13 +181,13 @@ public class StreamSlowMonitor implements ConfigurationObserver {
   }
 
   private void setConf(Configuration conf) {
-    this.minSlowDetectCount = conf.getInt(WAL_SLOW_DETECT_MIN_COUNT_KEY,
-        DEFAULT_WAL_SLOW_DETECT_MIN_COUNT);
+    this.minSlowDetectCount =
+      conf.getInt(WAL_SLOW_DETECT_MIN_COUNT_KEY, DEFAULT_WAL_SLOW_DETECT_MIN_COUNT);
     this.slowDataTtl = conf.getLong(WAL_SLOW_DETECT_DATA_TTL_KEY, DEFAULT_WAL_SLOW_DETECT_DATA_TTL);
     this.slowPacketAckMs = conf.getLong(DATANODE_SLOW_PACKET_PROCESS_TIME_KEY,
-        DEFAULT_DATANODE_SLOW_PACKET_PROCESS_TIME);
-    this.minLengthForSpeedCheck = conf.getLong(
-        DATANODE_PACKET_FLUSH_CHECK_SPEED_MIN_DATA_LENGTH_KEY,
+      DEFAULT_DATANODE_SLOW_PACKET_PROCESS_TIME);
+    this.minLengthForSpeedCheck =
+      conf.getLong(DATANODE_PACKET_FLUSH_CHECK_SPEED_MIN_DATA_LENGTH_KEY,
         DEFAULT_DATANODE_PACKET_FLUSH_CHECK_SPEED_MIN_DATA_LENGTH);
     this.minPacketFlushSpeedKBs = conf.getDouble(DATANODE_SLOW_PACKET_FLUSH_MIN_SPEED_KEY,
       DEFAULT_DATANODE_SLOW_PACKET_FLUSH_MIN_SPEED);
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/util/CancelableProgressable.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/util/CancelableProgressable.java
index 91c003cb6dd..0f80f874a31 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/util/CancelableProgressable.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/util/CancelableProgressable.java
@@ -1,5 +1,4 @@
 /*
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,8 +20,8 @@ package org.apache.hadoop.hbase.util;
 import org.apache.yetus.audience.InterfaceAudience;
 
 /**
- * Similar interface as {@link org.apache.hadoop.util.Progressable} but returns
- * a boolean to support canceling the operation.
+ * Similar interface as {@link org.apache.hadoop.util.Progressable} but returns a boolean to support
+ * canceling the operation.
  * <p/>
  * Used for doing updating of OPENING znode during log replay on region open.
  */
@@ -30,8 +29,8 @@ import org.apache.yetus.audience.InterfaceAudience;
 public interface CancelableProgressable {
 
   /**
-   * Report progress.  Returns true if operations should continue, false if the
-   * operation should be canceled and rolled back.
+   * Report progress. Returns true if operations should continue, false if the operation should be
+   * canceled and rolled back.
    * @return whether to continue (true) or cancel (false) the operation
    */
   boolean progress();
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/util/RecoverLeaseFSUtils.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/util/RecoverLeaseFSUtils.java
index 9c3da1658c7..e4a410aa9c3 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/util/RecoverLeaseFSUtils.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/util/RecoverLeaseFSUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -120,8 +120,10 @@ public final class RecoverLeaseFSUtils {
           // Cycle here until (subsequentPause * nbAttempt) elapses. While spinning, check
           // isFileClosed if available (should be in hadoop 2.0.5... not in hadoop 1 though.
           long localStartWaiting = EnvironmentEdgeManager.currentTime();
-          while ((EnvironmentEdgeManager.currentTime() - localStartWaiting) < subsequentPauseBase *
-            nbAttempt) {
+          while (
+            (EnvironmentEdgeManager.currentTime() - localStartWaiting)
+                < subsequentPauseBase * nbAttempt
+          ) {
             Thread.sleep(conf.getInt("hbase.lease.recovery.pause", 1000));
             if (findIsFileClosedMeth) {
               try {
@@ -152,10 +154,10 @@ public final class RecoverLeaseFSUtils {
   private static boolean checkIfTimedout(final Configuration conf, final long recoveryTimeout,
     final int nbAttempt, final Path p, final long startWaiting) {
     if (recoveryTimeout < EnvironmentEdgeManager.currentTime()) {
-      LOG.warn("Cannot recoverLease after trying for " +
-        conf.getInt("hbase.lease.recovery.timeout", 900000) +
-        "ms (hbase.lease.recovery.timeout); continuing, but may be DATALOSS!!!; " +
-        getLogMessageDetail(nbAttempt, p, startWaiting));
+      LOG.warn("Cannot recoverLease after trying for "
+        + conf.getInt("hbase.lease.recovery.timeout", 900000)
+        + "ms (hbase.lease.recovery.timeout); continuing, but may be DATALOSS!!!; "
+        + getLogMessageDetail(nbAttempt, p, startWaiting));
       return true;
     }
     return false;
@@ -170,8 +172,8 @@ public final class RecoverLeaseFSUtils {
     boolean recovered = false;
     try {
       recovered = dfs.recoverLease(p);
-      LOG.info((recovered ? "Recovered lease, " : "Failed to recover lease, ") +
-        getLogMessageDetail(nbAttempt, p, startWaiting));
+      LOG.info((recovered ? "Recovered lease, " : "Failed to recover lease, ")
+        + getLogMessageDetail(nbAttempt, p, startWaiting));
     } catch (IOException e) {
       if (e instanceof LeaseExpiredException && e.getMessage().contains("File does not exist")) {
         // This exception comes out instead of FNFE, fix it
@@ -189,8 +191,8 @@ public final class RecoverLeaseFSUtils {
    */
   private static String getLogMessageDetail(final int nbAttempt, final Path p,
     final long startWaiting) {
-    return "attempt=" + nbAttempt + " on file=" + p + " after " +
-      (EnvironmentEdgeManager.currentTime() - startWaiting) + "ms";
+    return "attempt=" + nbAttempt + " on file=" + p + " after "
+      + (EnvironmentEdgeManager.currentTime() - startWaiting) + "ms";
   }
 
   /**
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSTestBase.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSTestBase.java
index e1bc83ca684..0bac2fb00a3 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSTestBase.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestExcludeDatanodeManager.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestExcludeDatanodeManager.java
index a3da52ef335..f7ca1639ec6 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestExcludeDatanodeManager.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestExcludeDatanodeManager.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.io.asyncfs;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -44,19 +45,15 @@ public class TestExcludeDatanodeManager {
     StreamSlowMonitor streamSlowDNsMonitor =
       excludeDatanodeManager.getStreamSlowMonitor("testMonitor");
     assertEquals(0, excludeDatanodeManager.getExcludeDNs().size());
-    DatanodeInfo datanodeInfo =
-      new DatanodeInfo.DatanodeInfoBuilder().setIpAddr("0.0.0.0").setHostName("hostname1")
-        .setDatanodeUuid("uuid1").setXferPort(111).setInfoPort(222).setInfoSecurePort(333)
-        .setIpcPort(444).setNetworkLocation("location1").build();
-    streamSlowDNsMonitor
-      .checkProcessTimeAndSpeed(datanodeInfo, 100000, 5100,
-        System.currentTimeMillis() - 5100, 0);
-    streamSlowDNsMonitor
-      .checkProcessTimeAndSpeed(datanodeInfo, 100000, 5100,
-        System.currentTimeMillis() - 5100, 0);
-    streamSlowDNsMonitor
-      .checkProcessTimeAndSpeed(datanodeInfo, 100000, 5100,
-        System.currentTimeMillis() - 5100, 0);
+    DatanodeInfo datanodeInfo = new DatanodeInfo.DatanodeInfoBuilder().setIpAddr("0.0.0.0")
+      .setHostName("hostname1").setDatanodeUuid("uuid1").setXferPort(111).setInfoPort(222)
+      .setInfoSecurePort(333).setIpcPort(444).setNetworkLocation("location1").build();
+    streamSlowDNsMonitor.checkProcessTimeAndSpeed(datanodeInfo, 100000, 5100,
+      System.currentTimeMillis() - 5100, 0);
+    streamSlowDNsMonitor.checkProcessTimeAndSpeed(datanodeInfo, 100000, 5100,
+      System.currentTimeMillis() - 5100, 0);
+    streamSlowDNsMonitor.checkProcessTimeAndSpeed(datanodeInfo, 100000, 5100,
+      System.currentTimeMillis() - 5100, 0);
     assertEquals(1, excludeDatanodeManager.getExcludeDNs().size());
     assertTrue(excludeDatanodeManager.getExcludeDNs().containsKey(datanodeInfo));
   }
@@ -68,19 +65,15 @@ public class TestExcludeDatanodeManager {
     StreamSlowMonitor streamSlowDNsMonitor =
       excludeDatanodeManager.getStreamSlowMonitor("testMonitor");
     assertEquals(0, excludeDatanodeManager.getExcludeDNs().size());
-    DatanodeInfo datanodeInfo =
-      new DatanodeInfo.DatanodeInfoBuilder().setIpAddr("0.0.0.0").setHostName("hostname1")
-        .setDatanodeUuid("uuid1").setXferPort(111).setInfoPort(222).setInfoSecurePort(333)
-        .setIpcPort(444).setNetworkLocation("location1").build();
-    streamSlowDNsMonitor
-      .checkProcessTimeAndSpeed(datanodeInfo, 5000, 7000,
-        System.currentTimeMillis() - 7000, 0);
-    streamSlowDNsMonitor
-      .checkProcessTimeAndSpeed(datanodeInfo, 5000, 7000,
-        System.currentTimeMillis() - 7000, 0);
-    streamSlowDNsMonitor
-      .checkProcessTimeAndSpeed(datanodeInfo, 5000, 7000,
-        System.currentTimeMillis() - 7000, 0);
+    DatanodeInfo datanodeInfo = new DatanodeInfo.DatanodeInfoBuilder().setIpAddr("0.0.0.0")
+      .setHostName("hostname1").setDatanodeUuid("uuid1").setXferPort(111).setInfoPort(222)
+      .setInfoSecurePort(333).setIpcPort(444).setNetworkLocation("location1").build();
+    streamSlowDNsMonitor.checkProcessTimeAndSpeed(datanodeInfo, 5000, 7000,
+      System.currentTimeMillis() - 7000, 0);
+    streamSlowDNsMonitor.checkProcessTimeAndSpeed(datanodeInfo, 5000, 7000,
+      System.currentTimeMillis() - 7000, 0);
+    streamSlowDNsMonitor.checkProcessTimeAndSpeed(datanodeInfo, 5000, 7000,
+      System.currentTimeMillis() - 7000, 0);
     assertEquals(1, excludeDatanodeManager.getExcludeDNs().size());
     assertTrue(excludeDatanodeManager.getExcludeDNs().containsKey(datanodeInfo));
   }
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutput.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutput.java
index d363282921c..26cbbe034a5 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutput.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -57,6 +57,7 @@ import org.junit.experimental.categories.Category;
 import org.junit.rules.TestName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.apache.hbase.thirdparty.io.netty.channel.Channel;
 import org.apache.hbase.thirdparty.io.netty.channel.EventLoop;
 import org.apache.hbase.thirdparty.io.netty.channel.EventLoopGroup;
@@ -240,9 +241,9 @@ public class TestFanOutOneBlockAsyncDFSOutput extends AsyncFSTestBase {
     StreamSlowMonitor streamSlowDNsMonitor =
       excludeDatanodeManager.getStreamSlowMonitor("testMonitor");
     assertEquals(0, excludeDatanodeManager.getExcludeDNs().size());
-    try (FanOutOneBlockAsyncDFSOutput output = FanOutOneBlockAsyncDFSOutputHelper.createOutput(FS,
-      f, true, false, (short) 3, FS.getDefaultBlockSize(), eventLoop,
-      CHANNEL_CLASS, streamSlowDNsMonitor)) {
+    try (FanOutOneBlockAsyncDFSOutput output =
+      FanOutOneBlockAsyncDFSOutputHelper.createOutput(FS, f, true, false, (short) 3,
+        FS.getDefaultBlockSize(), eventLoop, CHANNEL_CLASS, streamSlowDNsMonitor)) {
       // should exclude the dead dn when retry so here we only have 2 DNs in pipeline
       assertEquals(2, output.getPipeline().length);
       assertEquals(1, excludeDatanodeManager.getExcludeDNs().size());
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutputHang.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutputHang.java
index 8ee838449e1..3a9c2979b6c 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutputHang.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutputHang.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -47,6 +47,7 @@ import org.junit.experimental.categories.Category;
 import org.junit.rules.TestName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.apache.hbase.thirdparty.io.netty.buffer.ByteBuf;
 import org.apache.hbase.thirdparty.io.netty.channel.Channel;
 import org.apache.hbase.thirdparty.io.netty.channel.ChannelHandlerContext;
@@ -70,10 +71,10 @@ public class TestFanOutOneBlockAsyncDFSOutputHang extends AsyncFSTestBase {
 
   @ClassRule
   public static final HBaseClassTestRule CLASS_RULE =
-      HBaseClassTestRule.forClass(TestFanOutOneBlockAsyncDFSOutputHang.class);
+    HBaseClassTestRule.forClass(TestFanOutOneBlockAsyncDFSOutputHang.class);
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(TestFanOutOneBlockAsyncDFSOutputHang.class);
+    LoggerFactory.getLogger(TestFanOutOneBlockAsyncDFSOutputHang.class);
 
   private static DistributedFileSystem FS;
 
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java
index 66735a3fc8e..ae0ddb1e4d7 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestOverwriteFileUnderConstruction.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestOverwriteFileUnderConstruction.java
index 592598c8bb4..7a3a6de10f0 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestOverwriteFileUnderConstruction.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestOverwriteFileUnderConstruction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java
index ab23b741b26..356fc664166 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,6 +21,7 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATA_ENCRYPTION_ALGORITHM_KEY;
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_ENCRYPT_DATA_TRANSFER_CIPHER_SUITES_KEY;
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_ENCRYPT_DATA_TRANSFER_KEY;
+
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -62,6 +63,7 @@ import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.apache.hbase.thirdparty.io.netty.channel.Channel;
 import org.apache.hbase.thirdparty.io.netty.channel.EventLoop;
 import org.apache.hbase.thirdparty.io.netty.channel.EventLoopGroup;
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSendBufSizePredictor.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSendBufSizePredictor.java
index 55ef0b72b52..07fc3afbf2f 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSendBufSizePredictor.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSendBufSizePredictor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -31,7 +31,7 @@ public class TestSendBufSizePredictor {
 
   @ClassRule
   public static final HBaseClassTestRule CLASS_RULE =
-      HBaseClassTestRule.forClass(TestSendBufSizePredictor.class);
+    HBaseClassTestRule.forClass(TestSendBufSizePredictor.class);
 
   @Test
   public void test() {
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
index 5d0b2ebfff3..af5154b9460 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
@@ -110,9 +110,9 @@ public final class HBaseKerberosUtils {
 
   /**
    * Set up configuration for a secure HDFS+HBase cluster.
-   * @param conf configuration object.
+   * @param conf             configuration object.
    * @param servicePrincipal service principal used by NN, HM and RS.
-   * @param spnegoPrincipal SPNEGO principal used by NN web UI.
+   * @param spnegoPrincipal  SPNEGO principal used by NN web UI.
    */
   public static void setSecuredConfiguration(Configuration conf, String servicePrincipal,
     String spnegoPrincipal) {
@@ -156,7 +156,7 @@ public final class HBaseKerberosUtils {
   /**
    * Set up SSL configuration for HDFS NameNode and DataNode.
    * @param utility a HBaseTestingUtility object.
-   * @param clazz the caller test class.
+   * @param clazz   the caller test class.
    * @throws Exception if unable to set up SSL configuration
    */
   public static void setSSLConfiguration(HBaseCommonTestingUtility utility, Class<?> clazz)
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/util/TestRecoverLeaseFSUtils.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/util/TestRecoverLeaseFSUtils.java
index 3931dfd5ba2..953d66b3fa4 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/util/TestRecoverLeaseFSUtils.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/util/TestRecoverLeaseFSUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.util;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
@@ -69,8 +68,8 @@ public class TestRecoverLeaseFSUtils {
     Mockito.verify(dfs, Mockito.times(5)).recoverLease(FILE);
     // Make sure we waited at least hbase.lease.recovery.dfs.timeout * 3 (the first two
     // invocations will happen pretty fast... the we fall into the longer wait loop).
-    assertTrue((EnvironmentEdgeManager.currentTime() - startTime) > (3 *
-      HTU.getConfiguration().getInt("hbase.lease.recovery.dfs.timeout", 61000)));
+    assertTrue((EnvironmentEdgeManager.currentTime() - startTime)
+        > (3 * HTU.getConfiguration().getInt("hbase.lease.recovery.dfs.timeout", 61000)));
   }
 
   /**
diff --git a/hbase-build-configuration/pom.xml b/hbase-build-configuration/pom.xml
index fda7b60e577..c8fa10f88b6 100644
--- a/hbase-build-configuration/pom.xml
+++ b/hbase-build-configuration/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
   /**
@@ -21,17 +21,29 @@
   -->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
+    <artifactId>hbase</artifactId>
     <version>2.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
   <artifactId>hbase-build-configuration</artifactId>
-  <name>Apache HBase - Build Configuration</name>
-  <description>Configure the build-support artifacts for maven build</description>
 
   <packaging>pom</packaging>
+  <name>Apache HBase - Build Configuration</name>
+  <description>Configure the build-support artifacts for maven build</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-annotations</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.yetus</groupId>
+      <artifactId>audience-annotations</artifactId>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
       <plugin>
@@ -50,18 +62,6 @@
       </plugin>
     </plugins>
   </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-annotations</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.yetus</groupId>
-      <artifactId>audience-annotations</artifactId>
-    </dependency>
-  </dependencies>
 
   <profiles>
     <profile>
diff --git a/hbase-checkstyle/pom.xml b/hbase-checkstyle/pom.xml
index dc6efc8d4bf..3e66cc9fa3e 100644
--- a/hbase-checkstyle/pom.xml
+++ b/hbase-checkstyle/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
 /**
 * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,38 +19,38 @@
 * limitations under the License.
 */
 -->
-<modelVersion>4.0.0</modelVersion>
-<groupId>org.apache.hbase</groupId>
-<artifactId>hbase-checkstyle</artifactId>
-<version>2.6.0-SNAPSHOT</version>
-<name>Apache HBase - Checkstyle</name>
-<description>Module to hold Checkstyle properties for HBase.</description>
-<!--REMOVE-->
+  <modelVersion>4.0.0</modelVersion>
+  <!--REMOVE-->
 
   <parent>
-    <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
+    <artifactId>hbase</artifactId>
     <version>2.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
+  <groupId>org.apache.hbase</groupId>
... 599688 lines suppressed ...