hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From syuanji...@apache.org
Subject [30/50] [abbrv] hbase git commit: HBASE-17532 Replaced explicit type with diamond operator
Date Fri, 10 Mar 2017 22:10:10 GMT
HBASE-17532 Replaced explicit type with diamond operator

Signed-off-by: Michael Stack <stack@apache.org>


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

Branch: refs/heads/hbase-12439
Commit: b53f354763f96d81ce15d7bded6f1bfd97aee68b
Parents: fee86eb
Author: Jan Hentschel <jan.hentschel@ultratendency.com>
Authored: Wed Jan 25 19:38:26 2017 +0100
Committer: Michael Stack <stack@apache.org>
Committed: Tue Mar 7 11:22:51 2017 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hbase/HColumnDescriptor.java  |  11 +-
 .../org/apache/hadoop/hbase/HRegionInfo.java    |   2 +-
 .../apache/hadoop/hbase/HTableDescriptor.java   |  19 ++--
 .../apache/hadoop/hbase/MetaTableAccessor.java  |  30 +++---
 .../org/apache/hadoop/hbase/ServerLoad.java     |   4 +-
 .../org/apache/hadoop/hbase/client/Append.java  |   2 +-
 .../hadoop/hbase/client/AsyncProcess.java       |  11 +-
 .../hbase/client/AsyncRequestFutureImpl.java    |  27 +++--
 .../client/AsyncRpcRetryingCallerFactory.java   |   2 +-
 .../apache/hadoop/hbase/client/BatchErrors.java |  10 +-
 .../client/ClientAsyncPrefetchScanner.java      |   4 +-
 .../hadoop/hbase/client/ClientScanner.java      |   7 +-
 .../hbase/client/ClusterStatusListener.java     |   2 +-
 .../hbase/client/ConnectionImplementation.java  |  11 +-
 .../org/apache/hadoop/hbase/client/Delete.java  |  10 +-
 .../org/apache/hadoop/hbase/client/Get.java     |  15 ++-
 .../apache/hadoop/hbase/client/HBaseAdmin.java  |  32 +++---
 .../hadoop/hbase/client/HRegionLocator.java     |   2 +-
 .../org/apache/hadoop/hbase/client/HTable.java  |  26 ++---
 .../hadoop/hbase/client/HTableMultiplexer.java  |  14 +--
 .../apache/hadoop/hbase/client/Increment.java   |   5 +-
 .../hadoop/hbase/client/MetricsConnection.java  |   2 +-
 .../apache/hadoop/hbase/client/MultiAction.java |   2 +-
 .../hadoop/hbase/client/MultiResponse.java      |   2 +-
 .../hbase/client/MultiServerCallable.java       |   2 +-
 .../apache/hadoop/hbase/client/Mutation.java    |  20 ++--
 .../hbase/client/OperationWithAttributes.java   |   2 +-
 .../client/PreemptiveFastFailInterceptor.java   |   6 +-
 .../org/apache/hadoop/hbase/client/Put.java     |   6 +-
 .../org/apache/hadoop/hbase/client/Result.java  |  15 ++-
 .../client/ResultBoundedCompletionService.java  |   2 +-
 .../RetriesExhaustedWithDetailsException.java   |   4 +-
 .../hbase/client/ReversedScannerCallable.java   |   2 +-
 .../hbase/client/RpcRetryingCallerFactory.java  |   4 +-
 .../hbase/client/RpcRetryingCallerImpl.java     |   3 +-
 .../RpcRetryingCallerWithReadReplicas.java      |   2 +-
 .../org/apache/hadoop/hbase/client/Scan.java    |  16 ++-
 .../client/ScannerCallableWithReplicas.java     |   6 +-
 .../hbase/client/ServerStatisticTracker.java    |   3 +-
 .../hbase/client/backoff/ServerStatistics.java  |   3 +-
 .../client/metrics/ServerSideScanMetrics.java   |   2 +-
 .../client/replication/ReplicationAdmin.java    |  10 +-
 .../replication/ReplicationSerDeHelper.java     |   4 +-
 .../hadoop/hbase/filter/CompareFilter.java      |   2 +-
 .../hbase/filter/DependentColumnFilter.java     |   2 +-
 .../apache/hadoop/hbase/filter/FilterList.java  |   2 +-
 .../FirstKeyValueMatchingQualifiersFilter.java  |   2 +-
 .../hadoop/hbase/filter/FuzzyRowFilter.java     |  11 +-
 .../hbase/filter/MultiRowRangeFilter.java       |   6 +-
 .../filter/MultipleColumnPrefixFilter.java      |   2 +-
 .../apache/hadoop/hbase/filter/ParseFilter.java |  14 +--
 .../hadoop/hbase/filter/TimestampsFilter.java   |   6 +-
 .../hadoop/hbase/ipc/NettyRpcDuplexHandler.java |   2 +-
 .../hadoop/hbase/protobuf/ProtobufUtil.java     |   9 +-
 .../apache/hadoop/hbase/quotas/QuotaFilter.java |   2 +-
 .../hadoop/hbase/quotas/QuotaRetriever.java     |   2 +-
 .../hbase/quotas/QuotaSettingsFactory.java      |   4 +-
 .../replication/ReplicationPeerConfig.java      |   4 +-
 .../replication/ReplicationPeerZKImpl.java      |   2 +-
 .../replication/ReplicationPeersZKImpl.java     |  10 +-
 .../hbase/replication/ReplicationQueueInfo.java |   2 +-
 .../replication/ReplicationQueuesZKImpl.java    |   6 +-
 .../hbase/replication/ReplicationTableBase.java |   8 +-
 .../replication/ReplicationTrackerZKImpl.java   |   7 +-
 .../TableBasedReplicationQueuesClientImpl.java  |   2 +-
 .../TableBasedReplicationQueuesImpl.java        |   2 +-
 .../hadoop/hbase/security/SecurityInfo.java     |   2 +-
 .../security/access/AccessControlClient.java    |   2 +-
 .../security/access/AccessControlUtil.java      |   8 +-
 .../security/visibility/Authorizations.java     |   2 +-
 .../security/visibility/VisibilityClient.java   |   8 +-
 .../hbase/shaded/protobuf/ProtobufUtil.java     |  21 ++--
 .../hbase/shaded/protobuf/RequestConverter.java |   3 +-
 .../shaded/protobuf/ResponseConverter.java      |   6 +-
 .../org/apache/hadoop/hbase/util/PoolMap.java   |  18 ++--
 .../org/apache/hadoop/hbase/util/Writables.java |   2 +-
 .../hadoop/hbase/zookeeper/HQuorumPeer.java     |   2 +-
 .../hadoop/hbase/zookeeper/InstancePending.java |   2 +-
 .../hbase/zookeeper/MetaTableLocator.java       |   8 +-
 .../hadoop/hbase/zookeeper/PendingWatcher.java  |   2 +-
 .../hbase/zookeeper/RecoverableZooKeeper.java   |   4 +-
 .../apache/hadoop/hbase/zookeeper/ZKUtil.java   |  30 +++---
 .../hbase/zookeeper/ZooKeeperWatcher.java       |   7 +-
 .../hbase/TestInterfaceAudienceAnnotations.java |  11 +-
 .../hadoop/hbase/client/TestAsyncProcess.java   |  42 ++++----
 .../hbase/client/TestClientNoCluster.java       |   8 +-
 .../hadoop/hbase/filter/TestKeyOnlyFilter.java  |   2 +-
 .../hbase/ipc/TestHBaseRpcControllerImpl.java   |   2 +-
 .../hadoop/hbase/util/BuilderStyleTest.java     |   2 +-
 .../hbase/zookeeper/TestInstancePending.java    |   4 +-
 .../java/org/apache/hadoop/hbase/CellUtil.java  |   2 +-
 .../org/apache/hadoop/hbase/ChoreService.java   |  10 +-
 .../hadoop/hbase/CompoundConfiguration.java     |   7 +-
 .../java/org/apache/hadoop/hbase/KeyValue.java  |   6 +-
 .../org/apache/hadoop/hbase/KeyValueUtil.java   |   2 +-
 .../hadoop/hbase/NamespaceDescriptor.java       |   6 +-
 .../org/apache/hadoop/hbase/ServerName.java     |   2 +-
 .../java/org/apache/hadoop/hbase/TableName.java |   2 +-
 .../java/org/apache/hadoop/hbase/TagUtil.java   |   8 +-
 .../hadoop/hbase/io/BoundedByteBufferPool.java  |   2 +-
 .../hbase/io/ByteBufferListOutputStream.java    |   4 +-
 .../apache/hadoop/hbase/io/ByteBufferPool.java  |   2 +-
 .../hadoop/hbase/io/crypto/Encryption.java      |   5 +-
 .../io/encoding/BufferedDataBlockEncoder.java   |   2 +-
 .../hbase/io/encoding/RowIndexCodecV1.java      |   2 +-
 .../hbase/io/encoding/RowIndexSeekerV1.java     |   2 +-
 .../hadoop/hbase/io/util/LRUDictionary.java     |   2 +-
 .../hadoop/hbase/io/util/StreamUtils.java       |  12 +--
 .../apache/hadoop/hbase/nio/SingleByteBuff.java |   2 +-
 .../org/apache/hadoop/hbase/security/User.java  |   3 +-
 .../hadoop/hbase/security/UserProvider.java     |   2 +-
 .../hadoop/hbase/trace/SpanReceiverHost.java    |   2 +-
 .../hadoop/hbase/types/StructBuilder.java       |   2 +-
 .../apache/hadoop/hbase/util/ArrayUtils.java    |   2 +-
 .../org/apache/hadoop/hbase/util/AvlUtil.java   |   2 +-
 .../hbase/util/BoundedCompletionService.java    |   4 +-
 .../hadoop/hbase/util/ByteRangeUtils.java       |   4 +-
 .../hadoop/hbase/util/CollectionUtils.java      |   3 +-
 .../hadoop/hbase/util/ConcatenatedLists.java    |   2 +-
 .../hbase/util/CoprocessorClassLoader.java      |   4 +-
 .../org/apache/hadoop/hbase/util/Counter.java   |   2 +-
 .../hadoop/hbase/util/DynamicClassLoader.java   |   2 +-
 .../apache/hadoop/hbase/util/IterableUtils.java |   2 +-
 .../org/apache/hadoop/hbase/util/KeyLocker.java |   4 +-
 .../java/org/apache/hadoop/hbase/util/Pair.java |   2 +-
 .../org/apache/hadoop/hbase/util/Threads.java   |   2 +-
 .../org/apache/hadoop/hbase/util/Triple.java    |   2 +-
 .../hadoop/hbase/util/WeakObjectPool.java       |   5 +-
 .../hbase/util/test/RedundantKVGenerator.java   |  16 +--
 .../org/apache/hadoop/hbase/ClassFinder.java    |  10 +-
 .../apache/hadoop/hbase/ResourceChecker.java    |   2 +-
 .../hbase/ResourceCheckerJUnitListener.java     |   6 +-
 .../org/apache/hadoop/hbase/TestCellUtil.java   |   8 +-
 .../apache/hadoop/hbase/TestClassFinder.java    |   2 +-
 .../hadoop/hbase/TestCompoundConfiguration.java |   9 +-
 .../org/apache/hadoop/hbase/TestKeyValue.java   |   4 +-
 .../hbase/io/TestBoundedByteBufferPool.java     |   2 +-
 .../hbase/io/TestTagCompressionContext.java     |   4 +-
 .../hadoop/hbase/nio/TestMultiByteBuff.java     |   2 +-
 .../hbase/types/TestFixedLengthWrapper.java     |   8 +-
 .../hbase/types/TestStructNullExtension.java    |   2 +-
 .../hbase/types/TestTerminatedWrapper.java      |  14 +--
 .../hbase/util/ClassLoaderTestHelper.java       |   4 +-
 .../apache/hadoop/hbase/util/TestAvlUtil.java   |   6 +-
 .../apache/hadoop/hbase/util/TestBase64.java    |   2 +-
 .../hbase/util/TestBoundedArrayQueue.java       |   2 +-
 .../hadoop/hbase/util/TestByteBufferUtils.java  |   2 +-
 .../util/TestByteRangeWithKVSerialization.java  |   2 +-
 .../org/apache/hadoop/hbase/util/TestBytes.java |   4 +-
 .../hbase/util/TestConcatenatedLists.java       |  14 +--
 .../apache/hadoop/hbase/util/TestKeyLocker.java |   2 +-
 .../hbase/util/TestLoadTestKVGenerator.java     |   2 +-
 .../hadoop/hbase/util/TestWeakObjectPool.java   |   4 +-
 .../client/coprocessor/AggregationClient.java   |  36 +++----
 .../coprocessor/AggregateImplementation.java    |  14 +--
 .../coprocessor/ColumnAggregationEndpoint.java  |   2 +-
 .../ColumnAggregationEndpointNullResponse.java  |   2 +-
 .../ColumnAggregationEndpointWithErrors.java    |   2 +-
 .../hbase/coprocessor/TestClassLoading.java     |  10 +-
 .../coprocessor/TestCoprocessorEndpoint.java    |   8 +-
 .../TestCoprocessorTableEndpoint.java           |   2 +-
 .../TestRegionServerCoprocessorEndpoint.java    |   6 +-
 .../coprocessor/TestRowProcessorEndpoint.java   |  19 ++--
 .../SecureBulkLoadEndpointClient.java           |   9 +-
 ...gionServerBulkLoadWithOldSecureEndpoint.java |   3 +-
 .../regionserver/TestServerCustomProtocol.java  |  14 +--
 ...ReplicationSyncUpToolWithBulkLoadedData.java |   2 +-
 .../coprocessor/example/BulkDeleteEndpoint.java |  10 +-
 .../coprocessor/example/RowCountEndpoint.java   |   4 +-
 .../hadoop/hbase/mapreduce/IndexBuilder.java    |   2 +-
 .../apache/hadoop/hbase/thrift/DemoClient.java  |  24 ++---
 .../hadoop/hbase/thrift/HttpDoAsClient.java     |   6 +-
 .../apache/hadoop/hbase/thrift2/DemoClient.java |   6 +-
 .../hbase/io/hfile/MemcachedBlockCache.java     |   2 +-
 .../hbase/CompatibilitySingletonFactory.java    |   2 +-
 .../TestCompatibilitySingletonFactory.java      |   5 +-
 .../MetricsHBaseServerSourceFactoryImpl.java    |   5 +-
 .../MetricsStochasticBalancerSourceImpl.java    |   4 +-
 .../apache/hadoop/hbase/metrics/Interns.java    |   4 +-
 .../metrics2/util/MetricSampleQuantiles.java    |   4 +-
 .../hbase/test/MetricsAssertHelperImpl.java     |   6 +-
 .../hadoop/hbase/DistributedHBaseCluster.java   |  12 +--
 .../hadoop/hbase/HBaseClusterManager.java       |   2 +-
 .../hbase/IntegrationTestDDLMasterFailover.java |  18 ++--
 .../hadoop/hbase/IntegrationTestIngest.java     |   4 +-
 .../hbase/IntegrationTestIngestWithACL.java     |   2 +-
 .../hbase/IntegrationTestIngestWithMOB.java     |   4 +-
 .../hbase/IntegrationTestIngestWithTags.java    |   2 +-
 ...tegrationTestIngestWithVisibilityLabels.java |  18 ++--
 .../hbase/IntegrationTestLazyCfLoading.java     |   3 +-
 .../hbase/IntegrationTestRegionReplicaPerf.java |   4 +-
 ...IntegrationTestRegionReplicaReplication.java |   4 +-
 .../hadoop/hbase/RESTApiClusterManager.java     |   2 +-
 .../hadoop/hbase/chaos/actions/Action.java      |   6 +-
 .../chaos/actions/BatchRestartRsAction.java     |   2 +-
 .../actions/RestartRandomDataNodeAction.java    |   2 +-
 .../actions/RollingBatchRestartRsAction.java    |   6 +-
 .../UnbalanceKillAndRebalanceAction.java        |   6 +-
 .../chaos/actions/UnbalanceRegionsAction.java   |   4 +-
 .../chaos/monkies/PolicyBasedChaosMonkey.java   |   2 +-
 .../chaos/policies/DoActionsOncePolicy.java     |   2 +-
 .../policies/PeriodicRandomActionPolicy.java    |   4 +-
 .../mapreduce/IntegrationTestBulkLoad.java      |   4 +-
 .../mapreduce/IntegrationTestImportTsv.java     |   2 +-
 .../hadoop/hbase/mttr/IntegrationTestMTTR.java  |   8 +-
 .../test/IntegrationTestBigLinkedList.java      |   8 +-
 .../test/IntegrationTestLoadAndVerify.java      |   2 +-
 .../hbase/test/IntegrationTestReplication.java  |   2 +-
 .../trace/IntegrationTestSendTraceRequests.java |   2 +-
 .../prefixtree/decode/ArraySearcherPool.java    |   3 +-
 .../codec/prefixtree/decode/PrefixTreeCell.java |   2 +-
 .../prefixtree/encode/EncoderPoolImpl.java      |   3 +-
 .../prefixtree/encode/other/LongEncoder.java    |   2 +-
 .../prefixtree/encode/tokenize/Tokenizer.java   |   2 +-
 .../util/byterange/impl/ByteRangeHashSet.java   |   2 +-
 .../util/byterange/impl/ByteRangeTreeSet.java   |   2 +-
 .../row/data/TestRowDataExerciseFInts.java      |   2 +-
 .../row/data/TestRowDataTrivialWithTags.java    |   2 +-
 .../prefixtree/row/data/TestRowDataUrls.java    |   2 +-
 .../timestamp/data/TestTimestampDataBasic.java  |   4 +-
 .../data/TestTimestampDataNumbers.java          |   4 +-
 .../data/TestTimestampDataRepeats.java          |   4 +-
 .../hbase/procedure2/ProcedureExecutor.java     |  24 ++---
 .../hbase/procedure2/RootProcedureState.java    |   6 +-
 .../hbase/procedure2/StateMachineProcedure.java |   2 +-
 .../procedure2/store/ProcedureStoreBase.java    |   3 +-
 .../store/wal/ProcedureWALPrettyPrinter.java    |   2 +-
 .../procedure2/store/wal/WALProcedureStore.java |   8 +-
 .../procedure2/ProcedureTestingUtility.java     |   8 +-
 .../procedure2/TestProcedureExecution.java      |  10 +-
 .../procedure2/TestProcedureReplayOrder.java    |   2 +-
 .../TestProcedureSchedulerConcurrency.java      |   3 +-
 .../procedure2/TestProcedureSuspended.java      |   2 +-
 .../hbase/procedure2/TestYieldProcedures.java   |   2 +-
 .../hbase/procedure2/util/TestDelayedUtil.java  |  10 +-
 .../hadoop/hbase/util/ForeignExceptionUtil.java |   2 +-
 .../apache/hadoop/hbase/rest/RESTServer.java    |   5 +-
 .../apache/hadoop/hbase/rest/RowResource.java   |   2 +-
 .../org/apache/hadoop/hbase/rest/RowSpec.java   |   5 +-
 .../apache/hadoop/hbase/rest/client/Client.java |   2 +-
 .../hadoop/hbase/rest/client/RemoteHTable.java  |   9 +-
 .../hadoop/hbase/rest/filter/GzipFilter.java    |   2 +-
 .../rest/filter/RestCsrfPreventionFilter.java   |   4 +-
 .../hadoop/hbase/rest/model/CellSetModel.java   |   2 +-
 .../hbase/rest/model/ColumnSchemaModel.java     |   2 +-
 .../rest/model/NamespacesInstanceModel.java     |   6 +-
 .../hbase/rest/model/NamespacesModel.java       |   4 +-
 .../hadoop/hbase/rest/model/RowModel.java       |   4 +-
 .../hadoop/hbase/rest/model/ScannerModel.java   |  16 +--
 .../rest/model/StorageClusterStatusModel.java   |   6 +-
 .../hadoop/hbase/rest/model/TableInfoModel.java |   2 +-
 .../hadoop/hbase/rest/model/TableListModel.java |   2 +-
 .../hbase/rest/model/TableSchemaModel.java      |   4 +-
 .../hbase/rest/PerformanceEvaluation.java       |  10 +-
 .../hbase/rest/TestGetAndPutResource.java       |   6 +-
 .../hadoop/hbase/rest/TestMultiRowResource.java |   2 +-
 .../rest/TestNamespacesInstanceResource.java    |  14 +--
 .../hbase/rest/TestScannersWithFilters.java     |   2 +-
 .../hadoop/hbase/rest/TestSchemaResource.java   |   2 +-
 .../hbase/rest/client/TestRemoteTable.java      |  14 +--
 .../rest/model/TestNamespacesInstanceModel.java |   2 +-
 .../hbase/rsgroup/RSGroupAdminClient.java       |   2 +-
 .../hbase/rsgroup/RSGroupAdminServer.java       |   6 +-
 .../hbase/rsgroup/RSGroupBasedLoadBalancer.java |  25 ++---
 .../balancer/TestRSGroupBasedLoadBalancer.java  |  20 ++--
 .../hadoop/hbase/rsgroup/TestRSGroupsBase.java  |   2 +-
 .../hadoop/hbase/HDFSBlocksDistribution.java    |   8 +-
 .../org/apache/hadoop/hbase/HealthChecker.java  |   2 +-
 .../org/apache/hadoop/hbase/JMXListener.java    |   2 +-
 .../apache/hadoop/hbase/LocalHBaseCluster.java  |   9 +-
 .../hbase/SslRMIClientSocketFactorySecure.java  |   2 +-
 .../hbase/SslRMIServerSocketFactorySecure.java  |   2 +-
 .../apache/hadoop/hbase/ZKNamespaceManager.java |   2 +-
 .../hadoop/hbase/backup/HFileArchiver.java      |   6 +-
 .../example/HFileArchiveTableMonitor.java       |   2 +-
 .../hbase/client/ClientSideRegionScanner.java   |   2 +-
 .../hadoop/hbase/client/HTableWrapper.java      |   2 +-
 .../hbase/client/TableSnapshotScanner.java      |   2 +-
 .../hbase/constraint/ConstraintProcessor.java   |   2 +-
 .../hadoop/hbase/constraint/Constraints.java    |   6 +-
 .../ZKSplitLogManagerCoordination.java          |   2 +-
 .../ZkSplitLogWorkerCoordination.java           |   2 +-
 .../hbase/coprocessor/CoprocessorHost.java      |  13 ++-
 .../coprocessor/MultiRowMutationEndpoint.java   |   4 +-
 .../hbase/coprocessor/ObserverContext.java      |   4 +-
 .../hbase/errorhandling/ForeignException.java   |   3 +-
 .../ForeignExceptionDispatcher.java             |   3 +-
 .../hadoop/hbase/executor/ExecutorService.java  |   5 +-
 .../favored/FavoredNodeAssignmentHelper.java    |  37 +++----
 .../hbase/favored/FavoredNodeLoadBalancer.java  |  28 +++--
 .../hadoop/hbase/favored/FavoredNodesPlan.java  |   2 +-
 .../hadoop/hbase/http/HttpRequestLog.java       |   2 +-
 .../apache/hadoop/hbase/http/HttpServer.java    |  11 +-
 .../hbase/http/lib/StaticUserWebFilter.java     |   2 +-
 .../org/apache/hadoop/hbase/io/FileLink.java    |   2 +-
 .../org/apache/hadoop/hbase/io/HFileLink.java   |   2 +-
 .../asyncfs/FanOutOneBlockAsyncDFSOutput.java   |   2 +-
 .../FanOutOneBlockAsyncDFSOutputHelper.java     |   3 +-
 .../hadoop/hbase/io/hfile/BlockCacheUtil.java   |   5 +-
 .../hfile/CacheableDeserializerIdManager.java   |   3 +-
 .../io/hfile/CompoundBloomFilterWriter.java     |   2 +-
 .../org/apache/hadoop/hbase/io/hfile/HFile.java |   4 +-
 .../hadoop/hbase/io/hfile/HFileBlock.java       |   3 +-
 .../hadoop/hbase/io/hfile/HFileBlockIndex.java  |  15 ++-
 .../hbase/io/hfile/HFilePrettyPrinter.java      |  10 +-
 .../hadoop/hbase/io/hfile/HFileReaderImpl.java  |  10 +-
 .../hadoop/hbase/io/hfile/HFileWriterImpl.java  |   8 +-
 .../hadoop/hbase/io/hfile/PrefetchExecutor.java |   3 +-
 .../hbase/io/hfile/bucket/BucketCache.java      |  17 ++-
 .../hbase/io/hfile/bucket/UniqueIndexMap.java   |   4 +-
 .../hadoop/hbase/io/util/MemorySizeUtil.java    |   4 +-
 .../hadoop/hbase/ipc/FifoRpcScheduler.java      |   2 +-
 .../org/apache/hadoop/hbase/ipc/RpcServer.java  |  18 ++--
 .../hadoop/hbase/ipc/SimpleRpcServer.java       |   7 +-
 .../hadoop/hbase/mapred/GroupingTableMap.java   |   2 +-
 .../hadoop/hbase/mapreduce/CopyTable.java       |   2 +-
 .../DefaultVisibilityExpressionResolver.java    |   2 +-
 .../hbase/mapreduce/GroupingTableMapper.java    |   2 +-
 .../hbase/mapreduce/HFileOutputFormat2.java     |  24 ++---
 .../hadoop/hbase/mapreduce/HashTable.java       |   6 +-
 .../apache/hadoop/hbase/mapreduce/Import.java   |   4 +-
 .../hadoop/hbase/mapreduce/ImportTsv.java       |  10 +-
 .../hbase/mapreduce/KeyValueSortReducer.java    |   2 +-
 .../hbase/mapreduce/LoadIncrementalHFiles.java  |   6 +-
 .../hbase/mapreduce/MultiHFileOutputFormat.java |   5 +-
 .../hbase/mapreduce/MultiTableInputFormat.java  |   2 +-
 .../mapreduce/MultiTableInputFormatBase.java    |   6 +-
 .../hadoop/hbase/mapreduce/PutSortReducer.java  |   4 +-
 .../hbase/mapreduce/ResultSerialization.java    |   2 +-
 .../hbase/mapreduce/TableInputFormatBase.java   |   9 +-
 .../hbase/mapreduce/TableMapReduceUtil.java     |   8 +-
 .../mapreduce/TableSnapshotInputFormat.java     |   2 +-
 .../mapreduce/TableSnapshotInputFormatImpl.java |   4 +-
 .../hadoop/hbase/mapreduce/TextSortReducer.java |   4 +-
 .../hbase/mapreduce/TsvImporterMapper.java      |   2 +-
 .../hadoop/hbase/mapreduce/WALInputFormat.java  |   4 +-
 .../hadoop/hbase/mapreduce/WALPlayer.java       |   2 +-
 .../hadoop/hbase/master/AssignmentManager.java  |  56 +++++-----
 .../master/AssignmentVerificationReport.java    |  48 +++------
 .../apache/hadoop/hbase/master/BulkReOpen.java  |   2 +-
 .../hadoop/hbase/master/CatalogJanitor.java     |  20 ++--
 .../hbase/master/ClusterSchemaServiceImpl.java  |   2 +-
 .../hbase/master/ClusterStatusPublisher.java    |   7 +-
 .../apache/hadoop/hbase/master/DeadServer.java  |   8 +-
 .../hbase/master/GeneralBulkAssigner.java       |   7 +-
 .../org/apache/hadoop/hbase/master/HMaster.java |  19 ++--
 .../hbase/master/MasterMetaBootstrap.java       |   4 +-
 .../hbase/master/MasterMobCompactionThread.java |   2 +-
 .../hadoop/hbase/master/MasterRpcServices.java  |   6 +-
 .../hadoop/hbase/master/MasterWalManager.java   |   8 +-
 .../apache/hadoop/hbase/master/RackManager.java |   2 +-
 .../hbase/master/RegionPlacementMaintainer.java |  35 +++----
 .../hadoop/hbase/master/RegionStates.java       |  84 +++++++--------
 .../hadoop/hbase/master/ServerManager.java      |  33 +++---
 .../SnapshotOfRegionAssignmentFromMeta.java     |  26 ++---
 .../hadoop/hbase/master/SplitLogManager.java    |  23 ++---
 .../hbase/master/balancer/BaseLoadBalancer.java |  63 ++++++------
 .../hbase/master/balancer/ClusterLoadState.java |   2 +-
 .../master/balancer/RegionLocationFinder.java   |  11 +-
 .../master/balancer/SimpleLoadBalancer.java     |  12 +--
 .../master/balancer/StochasticLoadBalancer.java |  10 +-
 .../hbase/master/cleaner/CleanerChore.java      |   2 +-
 .../master/cleaner/ReplicationMetaCleaner.java  |   2 +-
 .../cleaner/ReplicationZKNodeCleaner.java       |   2 +-
 .../hbase/master/locking/LockProcedure.java     |   2 +-
 .../normalizer/SimpleRegionNormalizer.java      |   2 +-
 .../procedure/CloneSnapshotProcedure.java       |   9 +-
 .../master/procedure/CreateTableProcedure.java  |   5 +-
 .../master/procedure/DeleteTableProcedure.java  |   4 +-
 .../master/procedure/EnableTableProcedure.java  |   5 +-
 .../procedure/MasterDDLOperationHelper.java     |   4 +-
 .../procedure/MergeTableRegionsProcedure.java   |   2 +-
 .../master/procedure/ModifyTableProcedure.java  |   2 +-
 .../procedure/RestoreSnapshotProcedure.java     |  13 +--
 .../master/procedure/ServerCrashProcedure.java  |   8 +-
 .../procedure/SplitTableRegionProcedure.java    |  10 +-
 .../procedure/TruncateTableProcedure.java       |   4 +-
 .../snapshot/DisabledTableSnapshotHandler.java  |   2 +-
 .../snapshot/EnabledTableSnapshotHandler.java   |   2 +-
 .../master/snapshot/SnapshotFileCache.java      |   7 +-
 .../hbase/master/snapshot/SnapshotManager.java  |  13 ++-
 .../master/snapshot/TakeSnapshotHandler.java    |   2 +-
 .../hbase/mob/DefaultMobStoreCompactor.java     |   2 +-
 .../hbase/mob/DefaultMobStoreFlusher.java       |   4 +-
 .../org/apache/hadoop/hbase/mob/MobFile.java    |   4 +-
 .../apache/hadoop/hbase/mob/MobFileCache.java   |   6 +-
 .../org/apache/hadoop/hbase/mob/MobUtils.java   |   6 +-
 .../PartitionedMobCompactionRequest.java        |   2 +-
 .../monitoring/MonitoredRPCHandlerImpl.java     |   2 +-
 .../hbase/monitoring/MonitoredTaskImpl.java     |   2 +-
 .../hadoop/hbase/monitoring/TaskMonitor.java    |   6 +-
 .../hbase/namespace/NamespaceStateManager.java  |   2 +-
 .../namespace/NamespaceTableAndRegionInfo.java  |   2 +-
 .../procedure/MasterProcedureManagerHost.java   |   3 +-
 .../hadoop/hbase/procedure/Procedure.java       |   6 +-
 .../hbase/procedure/ProcedureCoordinator.java   |   4 +-
 .../hbase/procedure/ProcedureManagerHost.java   |   6 +-
 .../hadoop/hbase/procedure/ProcedureMember.java |   2 +-
 .../flush/MasterFlushTableProcedureManager.java |   4 +-
 .../RegionServerFlushTableProcedureManager.java |   6 +-
 .../hbase/protobuf/ReplicationProtbufUtil.java  |   4 +-
 .../hadoop/hbase/quotas/MasterQuotaManager.java |   8 +-
 .../apache/hadoop/hbase/quotas/QuotaCache.java  |  13 +--
 .../apache/hadoop/hbase/quotas/QuotaUtil.java   |   4 +-
 .../hadoop/hbase/quotas/UserQuotaState.java     |   4 +-
 .../regionserver/AbstractMultiFileWriter.java   |   4 +-
 .../AnnotationReadingPriorityFunction.java      |  12 +--
 .../hbase/regionserver/BaseRowProcessor.java    |   2 +-
 .../hadoop/hbase/regionserver/CellSet.java      |   2 +-
 .../hbase/regionserver/CompactSplitThread.java  |   4 +-
 .../hbase/regionserver/CompactingMemStore.java  |   2 +-
 .../hbase/regionserver/CompactionTool.java      |   6 +-
 .../regionserver/CompositeImmutableSegment.java |   4 +-
 .../regionserver/DateTieredMultiFileWriter.java |   3 +-
 .../hbase/regionserver/DefaultMemStore.java     |   4 +-
 .../regionserver/DefaultStoreFileManager.java   |  16 +--
 .../hbase/regionserver/DefaultStoreFlusher.java |   2 +-
 .../regionserver/FlushAllLargeStoresPolicy.java |   2 +-
 .../FlushNonSloppyStoresFirstPolicy.java        |   2 +-
 .../hadoop/hbase/regionserver/HMobStore.java    |   6 +-
 .../hadoop/hbase/regionserver/HRegion.java      | 101 ++++++++----------
 .../hbase/regionserver/HRegionFileSystem.java   |   4 +-
 .../hbase/regionserver/HRegionServer.java       |  26 ++---
 .../hadoop/hbase/regionserver/HStore.java       |  54 +++++-----
 .../hbase/regionserver/HeapMemoryManager.java   |   2 +-
 .../hbase/regionserver/ImmutableSegment.java    |   2 +-
 .../hadoop/hbase/regionserver/KeyValueHeap.java |   6 +-
 .../hadoop/hbase/regionserver/Leases.java       |   2 +-
 .../hadoop/hbase/regionserver/LogRoller.java    |   3 +-
 .../hadoop/hbase/regionserver/LruHashMap.java   |   6 +-
 .../MemStoreCompactorSegmentsIterator.java      |   2 +-
 .../hbase/regionserver/MemStoreFlusher.java     |  10 +-
 .../hbase/regionserver/MemStoreLABImpl.java     |   2 +-
 .../regionserver/MemStoreSegmentsIterator.java  |   4 +-
 .../regionserver/MultiRowMutationProcessor.java |   2 +-
 .../MultiVersionConcurrencyControl.java         |   2 +-
 .../hbase/regionserver/RSRpcServices.java       |  34 +++---
 .../regionserver/RegionCoprocessorHost.java     |   4 +-
 .../regionserver/RegionServerAccounting.java    |   2 +-
 .../regionserver/RegionServicesForStores.java   |   2 +-
 .../regionserver/SecureBulkLoadManager.java     |  12 +--
 .../hadoop/hbase/regionserver/Segment.java      |   4 +-
 .../hbase/regionserver/SegmentFactory.java      |   2 +-
 .../hbase/regionserver/ServerNonceManager.java  |   3 +-
 .../hadoop/hbase/regionserver/ShutdownHook.java |   2 +-
 .../hbase/regionserver/StoreFileScanner.java    |   2 +-
 .../hadoop/hbase/regionserver/StoreFlusher.java |   2 +-
 .../hadoop/hbase/regionserver/StoreScanner.java |  14 ++-
 .../regionserver/StorefileRefresherChore.java   |   2 +-
 .../regionserver/StripeMultiFileWriter.java     |   6 +-
 .../hbase/regionserver/StripeStoreEngine.java   |   2 +-
 .../regionserver/StripeStoreFileManager.java    |  55 +++++-----
 .../hbase/regionserver/StripeStoreFlusher.java  |   2 +-
 .../compactions/CompactionRequest.java          |   2 +-
 .../regionserver/compactions/Compactor.java     |   6 +-
 .../compactions/DateTieredCompactionPolicy.java |   8 +-
 .../compactions/ExploringCompactionPolicy.java  |  10 +-
 .../compactions/FIFOCompactionPolicy.java       |   2 +-
 .../compactions/SortedCompactionPolicy.java     |   4 +-
 .../compactions/StripeCompactionPolicy.java     |  10 +-
 .../querymatcher/ScanDeleteTracker.java         |   3 +
 .../snapshot/RegionServerSnapshotManager.java   |   6 +-
 .../PressureAwareThroughputController.java      |   3 +-
 .../hbase/regionserver/wal/AbstractFSWAL.java   |   4 +-
 .../hbase/regionserver/wal/AsyncFSWAL.java      |   2 +-
 .../wal/AsyncProtobufLogWriter.java             |   2 +-
 .../hadoop/hbase/regionserver/wal/FSHLog.java   |   4 +-
 .../regionserver/wal/ProtobufLogReader.java     |   2 +-
 .../wal/SecureProtobufLogReader.java            |   2 +-
 .../regionserver/wal/SequenceIdAccounting.java  |   4 +-
 .../hadoop/hbase/regionserver/wal/WALEdit.java  |   4 +-
 .../regionserver/wal/WALEditsReplaySink.java    |   4 +-
 .../hbase/replication/BulkLoadCellFilter.java   |   2 +-
 .../hbase/replication/ChainWALEntryFilter.java  |   2 +-
 .../replication/HBaseReplicationEndpoint.java   |   4 +-
 .../regionserver/DumpReplicationQueues.java     |   6 +-
 .../HBaseInterClusterReplicationEndpoint.java   |   8 +-
 .../regionserver/HFileReplicator.java           |   8 +-
 .../replication/regionserver/MetricsSource.java |   2 +-
 .../RegionReplicaReplicationEndpoint.java       |   8 +-
 .../replication/regionserver/Replication.java   |   2 +-
 .../regionserver/ReplicationLoad.java           |   6 +-
 .../regionserver/ReplicationSink.java           |  23 ++---
 .../regionserver/ReplicationSource.java         |   8 +-
 .../regionserver/ReplicationSourceManager.java  |  26 +++--
 .../security/access/AccessControlLists.java     |  18 ++--
 .../hbase/security/access/AccessController.java |  14 ++-
 .../hbase/security/access/TableAuthManager.java |  13 ++-
 .../security/access/ZKPermissionWatcher.java    |   3 +-
 .../token/AuthenticationTokenSecretManager.java |   6 +-
 .../hadoop/hbase/security/token/TokenUtil.java  |   2 +-
 .../DefaultVisibilityLabelServiceImpl.java      |  40 +++----
 .../DefinedSetFilterScanLabelGenerator.java     |   8 +-
 .../visibility/EnforcingScanLabelGenerator.java |   4 +-
 .../security/visibility/ExpressionParser.java   |   4 +-
 .../FeedUserAuthScanLabelGenerator.java         |   4 +-
 .../visibility/VisibilityController.java        |  20 ++--
 .../visibility/VisibilityLabelsCache.java       |  19 ++--
 .../VisibilityReplicationEndpoint.java          |   6 +-
 .../visibility/VisibilityScanDeleteTracker.java |  45 ++++----
 .../security/visibility/VisibilityUtils.java    |   8 +-
 .../expression/NonLeafExpressionNode.java       |   4 +-
 .../hadoop/hbase/snapshot/ExportSnapshot.java   |  15 ++-
 .../hbase/snapshot/RestoreSnapshotHelper.java   |  34 +++---
 .../hadoop/hbase/snapshot/SnapshotInfo.java     |   3 +-
 .../hadoop/hbase/snapshot/SnapshotManifest.java |  10 +-
 .../hbase/snapshot/SnapshotManifestV1.java      |   5 +-
 .../hbase/snapshot/SnapshotManifestV2.java      |   5 +-
 .../hbase/snapshot/SnapshotReferenceUtil.java   |   5 +-
 .../org/apache/hadoop/hbase/tool/Canary.java    |  30 +++---
 .../util/BoundedPriorityBlockingQueue.java      |   2 +-
 .../hbase/util/CollectionBackedScanner.java     |   2 +-
 .../hadoop/hbase/util/ConnectionCache.java      |   5 +-
 .../hadoop/hbase/util/EncryptionTest.java       |   7 +-
 .../apache/hadoop/hbase/util/FSHDFSUtils.java   |   2 +-
 .../hadoop/hbase/util/FSRegionScanner.java      |   4 +-
 .../hadoop/hbase/util/FSTableDescriptors.java   |   9 +-
 .../org/apache/hadoop/hbase/util/FSUtils.java   |  35 +++----
 .../org/apache/hadoop/hbase/util/HBaseFsck.java |  77 +++++++-------
 .../org/apache/hadoop/hbase/util/IdLock.java    |   3 +-
 .../hadoop/hbase/util/IdReadWriteLock.java      |   3 +-
 .../apache/hadoop/hbase/util/JvmVersion.java    |   2 +-
 .../hadoop/hbase/util/ModifyRegionUtils.java    |   8 +-
 .../hadoop/hbase/util/MunkresAssignment.java    |  13 ++-
 .../apache/hadoop/hbase/util/RegionMover.java   |  15 ++-
 .../hadoop/hbase/util/RegionSizeCalculator.java |   2 +-
 .../hbase/util/RegionSplitCalculator.java       |   8 +-
 .../hadoop/hbase/util/RegionSplitter.java       |   2 +-
 .../hadoop/hbase/util/ServerCommandLine.java    |   2 +-
 .../hadoop/hbase/util/SortedCopyOnWriteSet.java |  20 ++--
 .../apache/hadoop/hbase/util/SortedList.java    |  18 ++--
 .../hbase/util/hbck/HFileCorruptionChecker.java |  34 +++---
 .../hadoop/hbase/wal/AbstractFSWALProvider.java |   2 +-
 .../hbase/wal/BoundedGroupingStrategy.java      |   3 +-
 .../hadoop/hbase/wal/DisabledWALProvider.java   |   5 +-
 .../hbase/wal/RegionGroupingProvider.java       |   2 +-
 .../org/apache/hadoop/hbase/wal/WALFactory.java |   4 +-
 .../org/apache/hadoop/hbase/wal/WALKey.java     |  10 +-
 .../hadoop/hbase/wal/WALPrettyPrinter.java      |   8 +-
 .../apache/hadoop/hbase/wal/WALSplitter.java    |  52 +++++-----
 .../hbase/zookeeper/DrainingServerTracker.java  |   2 +-
 .../hbase/zookeeper/MiniZooKeeperCluster.java   |   6 +-
 .../hbase/zookeeper/RegionServerTracker.java    |   5 +-
 .../hadoop/hbase/zookeeper/ZKServerTool.java    |   2 +-
 .../resources/hbase-webapps/master/table.jsp    |  10 +-
 .../hadoop/hbase/HBaseTestingUtility.java       |  14 +--
 .../org/apache/hadoop/hbase/HTestConst.java     |   2 +-
 .../apache/hadoop/hbase/MetaMockingUtil.java    |   2 +-
 .../apache/hadoop/hbase/MiniHBaseCluster.java   |   4 +-
 .../hadoop/hbase/MockRegionServerServices.java  |   4 +-
 .../hadoop/hbase/MultithreadedTestUtil.java     |   2 +-
 .../hadoop/hbase/PerformanceEvaluation.java     |  10 +-
 .../hbase/PerformanceEvaluationCommons.java     |   2 +-
 .../hadoop/hbase/TestCheckTestClasses.java      |   2 +-
 .../hadoop/hbase/TestGlobalMemStoreSize.java    |   2 +-
 .../hbase/TestHDFSBlocksDistribution.java       |   2 +-
 .../hbase/TestMetaTableAccessorNoCluster.java   |   6 +-
 .../hbase/TestPartialResultsFromClientSide.java |   2 +-
 .../hadoop/hbase/TestRegionRebalancing.java     |   2 +-
 ...TestServerSideScanMetricsFromClientSide.java |   2 +-
 .../hbase/TestStochasticBalancerJmxMetrics.java |   4 +-
 .../hadoop/hbase/backup/TestHFileArchiving.java |   6 +-
 .../TestZooKeeperTableArchiveClient.java        |  10 +-
 .../apache/hadoop/hbase/client/TestAdmin1.java  |   6 +-
 .../apache/hadoop/hbase/client/TestAdmin2.java  |   2 +-
 ...estAvoidCellReferencesIntoShippedBlocks.java |   6 +-
 .../client/TestBlockEvictionFromClient.java     |   4 +-
 .../client/TestClientOperationInterrupt.java    |   2 +-
 .../hbase/client/TestConnectionUtils.java       |   4 +-
 .../hadoop/hbase/client/TestFastFail.java       |   2 +-
 .../hadoop/hbase/client/TestFromClientSide.java |  10 +-
 .../hbase/client/TestFromClientSide3.java       |   8 +-
 .../hbase/client/TestHBaseAdminNoCluster.java   |   2 +-
 .../org/apache/hadoop/hbase/client/TestHCM.java |   4 +-
 .../hbase/client/TestHTableMultiplexer.java     |   2 +-
 .../client/TestIllegalTableDescriptor.java      |   2 +-
 .../client/TestIncrementsFromClientSide.java    |   2 +-
 .../hbase/client/TestIntraRowPagination.java    |   6 +-
 .../hadoop/hbase/client/TestMultiParallel.java  |  24 ++---
 .../hbase/client/TestReplicaWithCluster.java    |   4 +-
 .../hadoop/hbase/client/TestReplicasClient.java |   8 +-
 .../client/TestRestoreSnapshotFromClient.java   |   2 +-
 .../client/TestScannersFromClientSide.java      |  38 +++----
 .../hbase/client/TestSnapshotFromClient.java    |   4 +-
 .../hbase/client/TestSnapshotMetadata.java      |   6 +-
 .../hbase/client/TestTimestampsFilter.java      |   4 +-
 .../replication/TestReplicationAdmin.java       |  26 ++---
 .../TestReplicationAdminWithClusters.java       |   3 +-
 .../hbase/constraint/TestConstraints.java       |  10 +-
 .../coprocessor/TestCoprocessorInterface.java   |   2 +-
 .../hbase/coprocessor/TestHTableWrapper.java    |   2 +-
 .../coprocessor/TestOpenTableInCoprocessor.java |   2 +-
 .../coprocessor/TestRegionObserverBypass.java   |   2 +-
 .../TestRegionObserverInterface.java            |   2 +-
 .../hbase/coprocessor/TestWALObserver.java      |   9 +-
 .../TestFavoredNodeAssignmentHelper.java        |  45 ++++----
 .../hbase/filter/TestColumnPrefixFilter.java    |  26 +++--
 .../hbase/filter/TestColumnRangeFilter.java     |  18 ++--
 .../hbase/filter/TestDependentColumnFilter.java |   6 +-
 .../apache/hadoop/hbase/filter/TestFilter.java  |  40 +++----
 .../hadoop/hbase/filter/TestFilterList.java     |   8 +-
 .../TestFilterListOrOperatorWithBlkCnt.java     |   8 +-
 .../hbase/filter/TestFilterSerialization.java   |  18 ++--
 .../hbase/filter/TestFilterWithScanLimits.java  |   2 +-
 .../hadoop/hbase/filter/TestFilterWrapper.java  |   4 +-
 ...stFirstKeyValueMatchingQualifiersFilter.java |   2 +-
 .../TestFuzzyRowAndColumnRangeFilter.java       |   4 +-
 .../filter/TestFuzzyRowFilterEndToEnd.java      |  24 ++---
 .../filter/TestInvocationRecordFilter.java      |  12 +--
 .../hbase/filter/TestMultiRowRangeFilter.java   |  60 +++++------
 .../filter/TestMultipleColumnPrefixFilter.java  |  34 +++---
 .../TestSingleColumnValueExcludeFilter.java     |   2 +-
 .../hadoop/hbase/http/TestGlobalFilter.java     |   2 +-
 .../hadoop/hbase/http/TestHttpServer.java       |   6 +-
 .../hadoop/hbase/http/TestPathFilter.java       |   2 +-
 .../hbase/http/resource/JerseyResource.java     |   2 +-
 .../hadoop/hbase/http/ssl/KeyStoreTestUtil.java |   2 +-
 .../apache/hadoop/hbase/io/TestFileLink.java    |   4 +-
 .../hbase/io/TestHalfStoreFileReader.java       |   2 +-
 .../encoding/TestBufferedDataBlockEncoder.java  |   2 +-
 .../hbase/io/encoding/TestChangingEncoding.java |   3 +-
 .../io/encoding/TestDataBlockEncoders.java      |   9 +-
 .../hbase/io/encoding/TestEncodedSeekers.java   |   2 +-
 .../hbase/io/encoding/TestPrefixTree.java       |   4 +-
 .../io/encoding/TestPrefixTreeEncoding.java     |   7 +-
 .../encoding/TestSeekBeforeWithReverseScan.java |   4 +-
 .../encoding/TestSeekToBlockWithEncoders.java   |  20 ++--
 .../hadoop/hbase/io/hfile/CacheTestUtils.java   |   4 +-
 .../hbase/io/hfile/RandomDistribution.java      |   4 +-
 .../hadoop/hbase/io/hfile/TestCacheOnWrite.java |  13 ++-
 .../hbase/io/hfile/TestFixedFileTrailer.java    |   2 +-
 .../hadoop/hbase/io/hfile/TestHFileBlock.java   |  24 ++---
 .../hbase/io/hfile/TestHFileBlockIndex.java     |   8 +-
 .../io/hfile/TestHFileDataBlockEncoder.java     |   3 +-
 .../TestHFileInlineToRootChunkConversion.java   |   2 +-
 .../hbase/io/hfile/TestHFileWriterV3.java       |   4 +-
 .../hfile/TestLazyDataBlockDecompression.java   |   2 +-
 .../hadoop/hbase/io/hfile/TestReseekTo.java     |   4 +-
 .../io/hfile/TestScannerFromBucketCache.java    |   6 +-
 .../TestScannerSelectionUsingKeyRange.java      |   6 +-
 .../io/hfile/TestScannerSelectionUsingTTL.java  |   4 +-
 .../hadoop/hbase/io/hfile/TestSeekTo.java       |   2 +-
 .../hbase/io/hfile/bucket/TestBucketCache.java  |   4 +-
 .../io/hfile/bucket/TestBucketWriterThread.java |   2 +-
 .../hbase/ipc/TestSimpleRpcScheduler.java       |   4 +-
 .../hbase/mapred/TestTableMapReduceUtil.java    |   2 +-
 .../MultiTableInputFormatTestBase.java          |   2 +-
 .../hadoop/hbase/mapreduce/NMapInputFormat.java |   5 +-
 .../mapreduce/TestGroupingTableMapper.java      |   2 +-
 .../hbase/mapreduce/TestHFileOutputFormat2.java |  14 +--
 .../hbase/mapreduce/TestHRegionPartitioner.java |   4 +-
 .../hadoop/hbase/mapreduce/TestHashTable.java   |   3 +-
 .../hbase/mapreduce/TestImportExport.java       |   2 +-
 .../TestImportTSVWithOperationAttributes.java   |   2 +-
 .../hbase/mapreduce/TestImportTSVWithTTLs.java  |   2 +-
 .../TestImportTSVWithVisibilityLabels.java      |   6 +-
 .../hadoop/hbase/mapreduce/TestImportTsv.java   |   6 +-
 .../hbase/mapreduce/TestImportTsvParser.java    |   2 +-
 .../mapreduce/TestLoadIncrementalHFiles.java    |   4 +-
 .../mapreduce/TestMultiHFileOutputFormat.java   |   4 +-
 .../hadoop/hbase/mapreduce/TestRowCounter.java  |   2 +-
 .../TestSimpleTotalOrderPartitioner.java        |   3 +-
 .../hadoop/hbase/mapreduce/TestTableSplit.java  |   4 +-
 .../hbase/mapreduce/TestTimeRangeMapRed.java    |   7 +-
 .../hadoop/hbase/mapreduce/TestWALPlayer.java   |   2 +-
 .../hbase/mapreduce/TestWALRecordReader.java    |   3 +-
 .../hadoop/hbase/master/MockRegionServer.java   |  13 +--
 .../hbase/master/TestAssignmentListener.java    |   6 +-
 .../master/TestAssignmentManagerOnCluster.java  |   8 +-
 .../hadoop/hbase/master/TestCatalogJanitor.java |  11 +-
 .../master/TestClusterStatusPublisher.java      |  10 +-
 .../master/TestDistributedLogSplitting.java     |  14 +--
 .../hbase/master/TestMasterNoCluster.java       |   2 +-
 .../TestMasterOperationsForRegionReplicas.java  |   8 +-
 .../hbase/master/TestMasterStatusServlet.java   |   7 +-
 .../hbase/master/TestMasterWalManager.java      |   2 +-
 .../hbase/master/TestRegionPlacement.java       |  11 +-
 .../hbase/master/TestRegionPlacement2.java      |  12 +--
 .../hadoop/hbase/master/TestRollingRestart.java |   4 +-
 .../hbase/master/balancer/BalancerTestBase.java |  38 +++----
 .../master/balancer/TestBaseLoadBalancer.java   |  44 ++++----
 .../balancer/TestDefaultLoadBalancer.java       |  10 +-
 .../balancer/TestRegionLocationFinder.java      |   4 +-
 .../balancer/TestStochasticLoadBalancer.java    |  13 ++-
 .../hbase/master/cleaner/TestLogsCleaner.java   |   2 +-
 .../cleaner/TestReplicationHFileCleaner.java    |   6 +-
 .../MasterProcedureTestingUtility.java          |   2 +-
 ...TestMasterProcedureSchedulerConcurrency.java |   4 +-
 .../master/snapshot/TestSnapshotFileCache.java  |   4 +-
 .../snapshot/TestSnapshotHFileCleaner.java      |   2 +-
 .../hbase/mob/compactions/TestMobCompactor.java |   4 +-
 .../TestPartitionedMobCompactor.java            |   6 +-
 .../procedure/SimpleMasterProcedureManager.java |   2 +-
 .../procedure/SimpleRSProcedureManager.java     |   6 +-
 .../hadoop/hbase/procedure/TestProcedure.java   |   8 +-
 .../hbase/procedure/TestProcedureManager.java   |   2 +-
 .../hadoop/hbase/procedure/TestZKProcedure.java |  14 ++-
 .../procedure/TestZKProcedureControllers.java   |  14 ++-
 .../hbase/protobuf/TestReplicationProtobuf.java |   8 +-
 .../AbstractTestDateTieredCompactionPolicy.java |   2 +-
 .../regionserver/DataBlockEncodingTool.java     |  13 ++-
 .../EncodedSeekPerformanceTest.java             |   4 +-
 .../hbase/regionserver/KeyValueScanFixture.java |   2 +-
 .../hbase/regionserver/MockStoreFile.java       |   2 +-
 .../hbase/regionserver/OOMERegionServer.java    |   2 +-
 .../hbase/regionserver/RegionAsTable.java       |   4 +-
 .../hbase/regionserver/TestAtomicOperation.java |   6 +-
 .../hbase/regionserver/TestBlocksRead.java      |   4 +-
 .../hbase/regionserver/TestBlocksScanned.java   |   2 +-
 .../hadoop/hbase/regionserver/TestBulkLoad.java |  13 ++-
 .../regionserver/TestCacheOnWriteInSchema.java  |   2 +-
 .../hbase/regionserver/TestColumnSeeking.java   |  20 ++--
 .../regionserver/TestCompactingMemStore.java    |   8 +-
 .../hbase/regionserver/TestCompaction.java      |  24 ++---
 .../TestCompactionArchiveConcurrentClose.java   |   2 +-
 .../TestCompactionArchiveIOException.java       |   2 +-
 .../regionserver/TestCompactionPolicy.java      |  10 +-
 .../hbase/regionserver/TestCompactionState.java |   2 +-
 .../regionserver/TestCompoundBloomFilter.java   |   2 +-
 .../TestCorruptedRegionStoreFile.java           |   2 +-
 .../TestDefaultCompactSelection.java            |   4 +-
 .../hbase/regionserver/TestDefaultMemStore.java |  18 ++--
 .../regionserver/TestEncryptionKeyRotation.java |   4 +-
 .../TestEncryptionRandomKeying.java             |   2 +-
 .../TestEndToEndSplitTransaction.java           |   4 +-
 .../hbase/regionserver/TestFSErrorsExposed.java |   5 +-
 .../regionserver/TestGetClosestAtOrBefore.java  |   4 +-
 .../hbase/regionserver/TestHMobStore.java       |  17 ++-
 .../hadoop/hbase/regionserver/TestHRegion.java  | 103 +++++++++----------
 .../regionserver/TestHRegionOnCluster.java      |   2 +-
 .../regionserver/TestHRegionReplayEvents.java   |  11 +-
 .../regionserver/TestHRegionServerBulkLoad.java |   5 +-
 .../TestHRegionServerBulkLoadWithOldClient.java |   3 +-
 .../hbase/regionserver/TestJoinedScanners.java  |   2 +-
 .../hbase/regionserver/TestKeepDeletes.java     |  20 ++--
 .../hbase/regionserver/TestKeyValueHeap.java    |  12 +--
 .../hbase/regionserver/TestMajorCompaction.java |  11 +-
 .../hbase/regionserver/TestMemStoreLAB.java     |   2 +-
 .../hbase/regionserver/TestMinVersions.java     |   2 +-
 .../TestMiniBatchOperationInProgress.java       |   6 +-
 .../regionserver/TestMultiColumnScanner.java    |  16 +--
 .../regionserver/TestRegionFavoredNodes.java    |   3 +-
 .../hbase/regionserver/TestRegionIncrement.java |   4 +-
 .../TestRegionMergeTransactionOnCluster.java    |   6 +-
 .../regionserver/TestRegionReplicaFailover.java |   2 +-
 .../hbase/regionserver/TestRegionReplicas.java  |   2 +-
 .../regionserver/TestRegionSplitPolicy.java     |   6 +-
 .../regionserver/TestReversibleScanners.java    |   7 +-
 .../regionserver/TestSCVFWithMiniCluster.java   |   2 +-
 .../regionserver/TestScanWithBloomError.java    |  12 +--
 .../hadoop/hbase/regionserver/TestScanner.java  |  16 +--
 .../TestScannerRetriableFailure.java            |   2 +-
 .../regionserver/TestSeekOptimizations.java     |  18 ++--
 .../hadoop/hbase/regionserver/TestStore.java    |  12 +--
 .../hbase/regionserver/TestStoreFile.java       |  10 +-
 .../TestStoreFileRefresherChore.java            |   2 +-
 .../hbase/regionserver/TestStoreScanner.java    |  54 +++++-----
 .../regionserver/TestStripeStoreEngine.java     |   4 +-
 .../TestStripeStoreFileManager.java             |  12 +--
 .../hadoop/hbase/regionserver/TestTags.java     |   6 +-
 .../hbase/regionserver/TestWALLockup.java       |   4 +-
 .../hbase/regionserver/TestWideScanner.java     |   4 +-
 .../ConstantSizeFileListGenerator.java          |   2 +-
 .../compactions/EverythingPolicy.java           |   4 +-
 .../compactions/GaussianFileListGenerator.java  |   2 +-
 .../compactions/MockStoreFileGenerator.java     |   2 +-
 .../compactions/PerfTestCompactionPolicies.java |  10 +-
 .../SemiConstantSizeFileListGenerator.java      |   2 +-
 .../SinusoidalFileListGenerator.java            |   2 +-
 .../compactions/SpikyFileListGenerator.java     |   2 +-
 .../TestCompactedHFilesDischarger.java          |   4 +-
 .../regionserver/compactions/TestCompactor.java |   8 +-
 .../compactions/TestDateTieredCompactor.java    |   2 +-
 .../compactions/TestStripeCompactionPolicy.java |  38 +++----
 .../compactions/TestStripeCompactor.java        |   2 +-
 .../TestCompactionScanQueryMatcher.java         |   3 +-
 .../querymatcher/TestExplicitColumnTracker.java |  18 ++--
 .../TestScanWildcardColumnTracker.java          |  14 +--
 .../querymatcher/TestUserScanQueryMatcher.java  |  16 +--
 .../regionserver/wal/AbstractTestFSWAL.java     |   8 +-
 .../wal/AbstractTestLogRollPeriod.java          |   2 +-
 .../regionserver/wal/AbstractTestWALReplay.java |  21 ++--
 .../wal/FaultyProtobufLogReader.java            |   2 +-
 .../hbase/regionserver/wal/TestFSHLog.java      |   2 +-
 .../wal/TestKeyValueCompression.java            |   2 +-
 .../regionserver/wal/TestLogRollAbort.java      |   3 +-
 .../hbase/regionserver/wal/TestLogRolling.java  |   6 +-
 .../wal/TestLogRollingNoCluster.java            |   3 +-
 .../wal/TestSequenceIdAccounting.java           |  10 +-
 .../wal/TestWALActionsListener.java             |   5 +-
 .../wal/TestWALCellCodecWithCompression.java    |   4 +-
 .../replication/TestNamespaceReplication.java   |   2 +-
 .../replication/TestPerTableCFReplication.java  |  20 ++--
 .../hbase/replication/TestReplicationBase.java  |   3 +-
 .../replication/TestReplicationEndpoint.java    |   6 +-
 .../replication/TestReplicationSmallTests.java  |   7 +-
 .../replication/TestReplicationStateBasic.java  |  12 +--
 .../replication/TestReplicationSyncUpTool.java  |   2 +-
 .../TestReplicationTrackerZKImpl.java           |   2 +-
 .../TestReplicationWALEntryFilters.java         |  36 +++----
 .../replication/TestReplicationWithTags.java    |   4 +-
 ...egionReplicaReplicationEndpointNoMaster.java |   2 +-
 .../regionserver/TestReplicationSink.java       |  32 +++---
 .../TestReplicationSourceManager.java           |  16 ++-
 .../HbaseObjectWritableFor96Migration.java      |   6 +-
 .../access/TestAccessControlFilter.java         |   2 +-
 .../security/access/TestAccessController.java   |   4 +-
 .../access/TestCellACLWithMultipleVersions.java |   2 +-
 .../hbase/security/access/TestCellACLs.java     |   2 +-
 .../access/TestWithDisabledAuthorization.java   |   2 +-
 .../access/TestZKPermissionsWatcher.java        |   4 +-
 .../security/token/TestTokenAuthentication.java |   7 +-
 .../ExpAsStringVisibilityLabelServiceImpl.java  |  16 +--
 .../LabelFilteringScanLabelGenerator.java       |   2 +-
 .../visibility/TestVisibilityLabels.java        |  14 +--
 ...sibilityLabelsOpWithDifferentUsersNoACL.java |   2 +-
 .../TestVisibilityLabelsReplication.java        |   6 +-
 .../visibility/TestVisibilityLabelsWithACL.java |   4 +-
 ...VisibilityLabelsWithCustomVisLabService.java |   2 +-
 .../TestVisibilityLabelsWithDeletes.java        |   6 +-
 .../TestVisibilityLablesWithGroups.java         |   4 +-
 .../TestWithDisabledAuthorization.java          |   4 +-
 .../hbase/snapshot/SnapshotTestingUtils.java    |  10 +-
 .../hbase/snapshot/TestExportSnapshot.java      |   6 +-
 .../snapshot/TestExportSnapshotHelpers.java     |   4 +-
 .../snapshot/TestFlushSnapshotFromClient.java   |   2 +-
 .../hadoop/hbase/util/BaseTestHBaseFsck.java    |   9 +-
 .../hadoop/hbase/util/ConstantDelayQueue.java   |  10 +-
 .../hbase/util/HFileArchiveTestingUtil.java     |  10 +-
 .../util/LoadTestDataGeneratorWithTags.java     |   4 +-
 .../apache/hadoop/hbase/util/LoadTestTool.java  |   4 +-
 .../hadoop/hbase/util/MultiThreadedAction.java  |   2 +-
 .../hadoop/hbase/util/MultiThreadedReader.java  |   2 +-
 .../hbase/util/MultiThreadedReaderWithACL.java  |   4 +-
 .../hadoop/hbase/util/MultiThreadedUpdater.java |   2 +-
 .../hbase/util/MultiThreadedUpdaterWithACL.java |   4 +-
 .../hadoop/hbase/util/MultiThreadedWriter.java  |   2 +-
 .../hbase/util/MultiThreadedWriterBase.java     |   6 +-
 .../util/ProcessBasedLocalHBaseCluster.java     |  15 ++-
 .../util/TestBoundedPriorityBlockingQueue.java  |   4 +-
 .../hbase/util/TestCoprocessorScanPolicy.java   |   8 +-
 .../apache/hadoop/hbase/util/TestFSVisitor.java |  12 +--
 .../hbase/util/TestHBaseFsckEncryption.java     |   2 +-
 .../hadoop/hbase/util/TestHBaseFsckMOB.java     |   2 +-
 .../hadoop/hbase/util/TestHBaseFsckOneRS.java   |   6 +-
 .../hbase/util/TestHBaseFsckReplicas.java       |   4 +-
 .../hadoop/hbase/util/TestHBaseFsckTwoRS.java   |   2 +-
 .../apache/hadoop/hbase/util/TestIdLock.java    |   5 +-
 .../hadoop/hbase/util/TestIdReadWriteLock.java  |   5 +-
 .../hbase/util/TestMiniClusterLoadEncoded.java  |   2 +-
 .../util/TestMiniClusterLoadSequential.java     |   2 +-
 .../apache/hadoop/hbase/util/TestPoolMap.java   |   6 +-
 .../hbase/util/TestRegionSizeCalculator.java    |   2 +-
 .../hbase/util/TestRegionSplitCalculator.java   |  44 +++-----
 .../hadoop/hbase/util/TestRegionSplitter.java   |   6 +-
 .../hbase/util/TestSortedCopyOnWriteSet.java    |   5 +-
 .../hadoop/hbase/util/TestSortedList.java       |  11 +-
 .../util/hbck/OfflineMetaRebuildTestCore.java   |   2 +-
 .../apache/hadoop/hbase/wal/IOTestProvider.java |   2 +-
 .../wal/TestBoundedRegionGroupingStrategy.java  |   2 +-
 .../hadoop/hbase/wal/TestFSHLogProvider.java    |  10 +-
 .../apache/hadoop/hbase/wal/TestSecureWAL.java  |   3 +-
 .../apache/hadoop/hbase/wal/TestWALFactory.java |  12 +--
 .../hadoop/hbase/wal/TestWALFiltering.java      |   3 +-
 .../hbase/wal/TestWALReaderOnSecureWAL.java     |   3 +-
 .../apache/hadoop/hbase/wal/TestWALSplit.java   |   8 +-
 .../hbase/wal/WALPerformanceEvaluation.java     |   7 +-
 .../hadoop/hbase/zookeeper/TestZKMulti.java     |  32 +++---
 .../hbase/zookeeper/TestZooKeeperACL.java       |   2 +-
 .../apache/hadoop/hbase/thrift/CallQueue.java   |   2 +-
 .../hadoop/hbase/thrift/IncrementCoalescer.java |   4 +-
 .../hbase/thrift/TBoundedThreadPoolServer.java  |   4 +-
 .../hadoop/hbase/thrift/ThriftServerRunner.java |  31 +++---
 .../hadoop/hbase/thrift/ThriftUtilities.java    |  12 +--
 .../thrift2/ThriftHBaseServiceHandler.java      |   3 +-
 .../hadoop/hbase/thrift2/ThriftServer.java      |   6 +-
 .../hadoop/hbase/thrift2/ThriftUtilities.java   |  14 +--
 .../hadoop/hbase/thrift/TestCallQueue.java      |   8 +-
 .../hbase/thrift/TestThriftHttpServer.java      |   2 +-
 .../hadoop/hbase/thrift/TestThriftServer.java   |  32 +++---
 .../hbase/thrift/TestThriftServerCmdLine.java   |   4 +-
 .../thrift2/TestThriftHBaseServiceHandler.java  | 102 +++++++++---------
 ...TestThriftHBaseServiceHandlerWithLabels.java |  34 +++---
 883 files changed, 3176 insertions(+), 3576 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
index e571aae..545ea61 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
@@ -254,10 +254,8 @@ public class HColumnDescriptor implements Comparable<HColumnDescriptor> {
    */
   public static final boolean DEFAULT_PREFETCH_BLOCKS_ON_OPEN = false;
 
-  private final static Map<String, String> DEFAULT_VALUES
-    = new HashMap<String, String>();
-  private final static Set<Bytes> RESERVED_KEYWORDS
-      = new HashSet<Bytes>();
+  private final static Map<String, String> DEFAULT_VALUES = new HashMap<>();
+  private final static Set<Bytes> RESERVED_KEYWORDS = new HashSet<>();
 
   static {
     DEFAULT_VALUES.put(BLOOMFILTER, DEFAULT_BLOOMFILTER);
@@ -293,15 +291,14 @@ public class HColumnDescriptor implements Comparable<HColumnDescriptor> {
   private byte [] name;
 
   // Column metadata
-  private final Map<Bytes, Bytes> values =
-      new HashMap<Bytes, Bytes>();
+  private final Map<Bytes, Bytes> values = new HashMap<>();
 
   /**
    * A map which holds the configuration specific to the column family.
    * The keys of the map have the same names as config keys and override the defaults with
    * cf-specific settings. Example usage may be for compactions, etc.
    */
-  private final Map<String, String> configuration = new HashMap<String, String>();
+  private final Map<String, String> configuration = new HashMap<>();
 
   /*
    * Cache the max versions rather than calculate it every time.

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
index da0d941..045f866 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
@@ -1167,7 +1167,7 @@ public class HRegionInfo implements Comparable<HRegionInfo> {
       throw new IllegalArgumentException("Can't build an object with empty bytes array");
     }
     DataInputBuffer in = new DataInputBuffer();
-    List<HRegionInfo> hris = new ArrayList<HRegionInfo>();
+    List<HRegionInfo> hris = new ArrayList<>();
     try {
       in.reset(bytes, offset, length);
       while (in.available() > 0) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
index 05891df..0a4d4ca 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
@@ -64,15 +64,14 @@ public class HTableDescriptor implements Comparable<HTableDescriptor> {
    * includes values like IS_ROOT, IS_META, DEFERRED_LOG_FLUSH, SPLIT_POLICY,
    * MAX_FILE_SIZE, READONLY, MEMSTORE_FLUSHSIZE etc...
    */
-  private final Map<Bytes, Bytes> values =
-      new HashMap<Bytes, Bytes>();
+  private final Map<Bytes, Bytes> values = new HashMap<>();
 
   /**
    * A map which holds the configuration specific to the table.
    * The keys of the map have the same names as config keys and override the defaults with
    * table-specific settings. Example usage may be for compactions, etc.
    */
-  private final Map<String, String> configuration = new HashMap<String, String>();
+  private final Map<String, String> configuration = new HashMap<>();
 
   public static final String SPLIT_POLICY = "SPLIT_POLICY";
 
@@ -236,10 +235,8 @@ public class HTableDescriptor implements Comparable<HTableDescriptor> {
 
   public static final boolean DEFAULT_REGION_MEMSTORE_REPLICATION = true;
 
-  private final static Map<String, String> DEFAULT_VALUES
-    = new HashMap<String, String>();
-  private final static Set<Bytes> RESERVED_KEYWORDS
-      = new HashSet<Bytes>();
+  private final static Map<String, String> DEFAULT_VALUES = new HashMap<>();
+  private final static Set<Bytes> RESERVED_KEYWORDS = new HashSet<>();
 
   static {
     DEFAULT_VALUES.put(MAX_FILESIZE,
@@ -278,7 +275,7 @@ public class HTableDescriptor implements Comparable<HTableDescriptor> {
    * Maps column family name to the respective HColumnDescriptors
    */
   private final Map<byte [], HColumnDescriptor> families =
-    new TreeMap<byte [], HColumnDescriptor>(Bytes.BYTES_RAWCOMPARATOR);
+    new TreeMap<>(Bytes.BYTES_RAWCOMPARATOR);
 
   /**
    * <em> INTERNAL </em> Private constructor used internally creating table descriptors for
@@ -933,8 +930,8 @@ public class HTableDescriptor implements Comparable<HTableDescriptor> {
     StringBuilder s = new StringBuilder();
 
     // step 1: set partitioning and pruning
-    Set<Bytes> reservedKeys = new TreeSet<Bytes>();
-    Set<Bytes> userKeys = new TreeSet<Bytes>();
+    Set<Bytes> reservedKeys = new TreeSet<>();
+    Set<Bytes> userKeys = new TreeSet<>();
     for (Map.Entry<Bytes, Bytes> entry : values.entrySet()) {
       if (entry.getKey() == null || entry.getKey().get() == null) continue;
       String key = Bytes.toString(entry.getKey().get());
@@ -1412,7 +1409,7 @@ public class HTableDescriptor implements Comparable<HTableDescriptor> {
    * @return The list of co-processors classNames
    */
   public List<String> getCoprocessors() {
-    List<String> result = new ArrayList<String>(this.values.entrySet().size());
+    List<String> result = new ArrayList<>(this.values.entrySet().size());
     Matcher keyMatcher;
     for (Map.Entry<Bytes, Bytes> e : this.values.entrySet()) {
       keyMatcher = HConstants.CP_HTD_ATTR_KEY_PATTERN.matcher(Bytes.toString(e.getKey().get()));

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index 61d4c66..ee8d5fd 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -170,8 +170,7 @@ public class MetaTableAccessor {
   @Deprecated
   public static NavigableMap<HRegionInfo, ServerName> allTableRegions(
       Connection connection, final TableName tableName) throws IOException {
-    final NavigableMap<HRegionInfo, ServerName> regions =
-      new TreeMap<HRegionInfo, ServerName>();
+    final NavigableMap<HRegionInfo, ServerName> regions = new TreeMap<>();
     Visitor visitor = new TableVisitorBase(tableName) {
       @Override
       public boolean visitInternal(Result result) throws IOException {
@@ -311,7 +310,7 @@ public class MetaTableAccessor {
     HRegionLocation location = getRegionLocation(connection, regionName);
     return location == null
       ? null
-      : new Pair<HRegionInfo, ServerName>(location.getRegionInfo(), location.getServerName());
+      : new Pair<>(location.getRegionInfo(), location.getServerName());
   }
 
   /**
@@ -402,7 +401,7 @@ public class MetaTableAccessor {
     if (mergeA == null && mergeB == null) {
       return null;
     }
-    return new Pair<HRegionInfo, HRegionInfo>(mergeA, mergeB);
+    return new Pair<>(mergeA, mergeB);
  }
 
   /**
@@ -477,7 +476,7 @@ public class MetaTableAccessor {
   @Nullable
   static List<HRegionInfo> getListOfHRegionInfos(final List<Pair<HRegionInfo, ServerName>> pairs) {
     if (pairs == null || pairs.isEmpty()) return null;
-    List<HRegionInfo> result = new ArrayList<HRegionInfo>(pairs.size());
+    List<HRegionInfo> result = new ArrayList<>(pairs.size());
     for (Pair<HRegionInfo, ServerName> pair: pairs) {
       result.add(pair.getFirst());
     }
@@ -635,8 +634,7 @@ public class MetaTableAccessor {
           }
           for (HRegionLocation loc : current.getRegionLocations()) {
             if (loc != null) {
-              this.results.add(new Pair<HRegionInfo, ServerName>(
-                loc.getRegionInfo(), loc.getServerName()));
+              this.results.add(new Pair<>(loc.getRegionInfo(), loc.getServerName()));
             }
           }
         }
@@ -658,7 +656,7 @@ public class MetaTableAccessor {
   public static NavigableMap<HRegionInfo, Result>
   getServerUserRegions(Connection connection, final ServerName serverName)
     throws IOException {
-    final NavigableMap<HRegionInfo, Result> hris = new TreeMap<HRegionInfo, Result>();
+    final NavigableMap<HRegionInfo, Result> hris = new TreeMap<>();
     // Fill the above hris map with entries from hbase:meta that have the passed
     // servername.
     CollectingVisitor<Result> v = new CollectingVisitor<Result>() {
@@ -981,7 +979,7 @@ public class MetaTableAccessor {
     HRegionInfo regionInfo = getHRegionInfo(r, getRegionInfoColumn());
     if (regionInfo == null) return null;
 
-    List<HRegionLocation> locations = new ArrayList<HRegionLocation>(1);
+    List<HRegionLocation> locations = new ArrayList<>(1);
     NavigableMap<byte[],NavigableMap<byte[],byte[]>> familyMap = r.getNoVersionMap();
 
     locations.add(getRegionLocation(r, regionInfo, 0));
@@ -1069,7 +1067,7 @@ public class MetaTableAccessor {
     HRegionInfo splitA = getHRegionInfo(data, HConstants.SPLITA_QUALIFIER);
     HRegionInfo splitB = getHRegionInfo(data, HConstants.SPLITB_QUALIFIER);
 
-    return new PairOfSameType<HRegionInfo>(splitA, splitB);
+    return new PairOfSameType<>(splitA, splitB);
   }
 
   /**
@@ -1083,7 +1081,7 @@ public class MetaTableAccessor {
     HRegionInfo mergeA = getHRegionInfo(data, HConstants.MERGEA_QUALIFIER);
     HRegionInfo mergeB = getHRegionInfo(data, HConstants.MERGEB_QUALIFIER);
 
-    return new PairOfSameType<HRegionInfo>(mergeA, mergeB);
+    return new PairOfSameType<>(mergeA, mergeB);
   }
 
   /**
@@ -1183,7 +1181,7 @@ public class MetaTableAccessor {
    * A {@link Visitor} that collects content out of passed {@link Result}.
    */
   static abstract class CollectingVisitor<T> implements Visitor {
-    final List<T> results = new ArrayList<T>();
+    final List<T> results = new ArrayList<>();
     @Override
     public boolean visit(Result r) throws IOException {
       if (r ==  null || r.isEmpty()) return true;
@@ -1426,7 +1424,7 @@ public class MetaTableAccessor {
    */
   static void deleteFromMetaTable(final Connection connection, final Delete d)
     throws IOException {
-    List<Delete> dels = new ArrayList<Delete>(1);
+    List<Delete> dels = new ArrayList<>(1);
     dels.add(d);
     deleteFromMetaTable(connection, dels);
   }
@@ -1594,7 +1592,7 @@ public class MetaTableAccessor {
   public static void addRegionsToMeta(Connection connection,
       List<HRegionInfo> regionInfos, int regionReplication, long ts)
           throws IOException {
-    List<Put> puts = new ArrayList<Put>();
+    List<Put> puts = new ArrayList<>();
     for (HRegionInfo regionInfo : regionInfos) {
       if (RegionReplicaUtil.isDefaultReplica(regionInfo)) {
         Put put = makePutFromRegionInfo(regionInfo, ts);
@@ -1970,7 +1968,7 @@ public class MetaTableAccessor {
    */
   public static void deleteRegions(Connection connection,
                                    List<HRegionInfo> regionsInfo, long ts) throws IOException {
-    List<Delete> deletes = new ArrayList<Delete>(regionsInfo.size());
+    List<Delete> deletes = new ArrayList<>(regionsInfo.size());
     for (HRegionInfo hri: regionsInfo) {
       Delete e = new Delete(hri.getRegionName());
       e.addFamily(getCatalogFamily(), ts);
@@ -1991,7 +1989,7 @@ public class MetaTableAccessor {
                                    final List<HRegionInfo> regionsToRemove,
                                    final List<HRegionInfo> regionsToAdd)
     throws IOException {
-    List<Mutation> mutation = new ArrayList<Mutation>();
+    List<Mutation> mutation = new ArrayList<>();
     if (regionsToRemove != null) {
       for (HRegionInfo hri: regionsToRemove) {
         mutation.add(makeDeleteFromRegionInfo(hri));

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
index d16c90f..e884e51 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
@@ -230,7 +230,7 @@ public class ServerLoad {
    */
   public Map<byte[], RegionLoad> getRegionsLoad() {
     Map<byte[], RegionLoad> regionLoads =
-      new TreeMap<byte[], RegionLoad>(Bytes.BYTES_COMPARATOR);
+      new TreeMap<>(Bytes.BYTES_COMPARATOR);
     for (ClusterStatusProtos.RegionLoad rl : serverLoad.getRegionLoadsList()) {
       RegionLoad regionLoad = new RegionLoad(rl);
       regionLoads.put(regionLoad.getName(), regionLoad);
@@ -261,7 +261,7 @@ public class ServerLoad {
   public String[] getRsCoprocessors() {
     // Need a set to remove duplicates, but since generated Coprocessor class
     // is not Comparable, make it a Set<String> instead of Set<Coprocessor>
-    TreeSet<String> coprocessSet = new TreeSet<String>();
+    TreeSet<String> coprocessSet = new TreeSet<>();
     for (Coprocessor coprocessor : obtainServerLoadPB().getCoprocessorsList()) {
       coprocessSet.add(coprocessor.getName());
     }

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
index fd2df93..15497ce 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
@@ -123,7 +123,7 @@ public class Append extends Mutation {
     byte [] family = CellUtil.cloneFamily(cell);
     List<Cell> list = this.familyMap.get(family);
     if (list == null) {
-      list  = new ArrayList<Cell>(1);
+      list  = new ArrayList<>(1);
     }
     // find where the new entry should be placed in the List
     list.add(cell);

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
index 269d316..a65d327 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
@@ -251,9 +251,8 @@ class AsyncProcess {
     boolean atLeastOne) throws InterruptedIOException {
     TableName tableName = task.getTableName();
     RowAccess<? extends Row> rows = task.getRowAccess();
-    Map<ServerName, MultiAction> actionsByServer =
-        new HashMap<ServerName, MultiAction>();
-    List<Action> retainedActions = new ArrayList<Action>(rows.size());
+    Map<ServerName, MultiAction> actionsByServer = new HashMap<>();
+    List<Action> retainedActions = new ArrayList<>(rows.size());
 
     NonceGenerator ng = this.connection.getNonceGenerator();
     long nonceGroup = ng.getNonceGroup(); // Currently, nonce group is per entire client.
@@ -287,8 +286,8 @@ class AsyncProcess {
           }
           loc = locs.getDefaultRegionLocation();
         } catch (IOException ex) {
-          locationErrors = new ArrayList<Exception>(1);
-          locationErrorRows = new ArrayList<Integer>(1);
+          locationErrors = new ArrayList<>(1);
+          locationErrorRows = new ArrayList<>(1);
           LOG.error("Failed to get region location ", ex);
           // This action failed before creating ars. Retain it, but do not add to submit list.
           // We will then add it to ars in an already-failed state.
@@ -368,7 +367,7 @@ class AsyncProcess {
    */
   private <CResult> AsyncRequestFuture submitAll(AsyncProcessTask task) {
     RowAccess<? extends Row> rows = task.getRowAccess();
-    List<Action> actions = new ArrayList<Action>(rows.size());
+    List<Action> actions = new ArrayList<>(rows.size());
 
     // The position will be used by the processBatch to match the object array returned.
     int posInList = -1;

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
index c3caff8..41431bb 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
@@ -103,9 +103,8 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
         }
       }
       if (done) return; // Done within primary timeout
-      Map<ServerName, MultiAction> actionsByServer =
-          new HashMap<ServerName, MultiAction>();
-      List<Action> unknownLocActions = new ArrayList<Action>();
+      Map<ServerName, MultiAction> actionsByServer = new HashMap<>();
+      List<Action> unknownLocActions = new ArrayList<>();
       if (replicaGetIndices == null) {
         for (int i = 0; i < results.length; ++i) {
           addReplicaActions(i, actionsByServer, unknownLocActions);
@@ -119,7 +118,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
         sendMultiAction(actionsByServer, 1, null, unknownLocActions.isEmpty());
       }
       if (!unknownLocActions.isEmpty()) {
-        actionsByServer = new HashMap<ServerName, MultiAction>();
+        actionsByServer = new HashMap<>();
         for (Action action : unknownLocActions) {
           addReplicaActionsAgain(action, actionsByServer);
         }
@@ -374,7 +373,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
           hasAnyReplicaGets = true;
           if (hasAnyNonReplicaReqs) { // Mixed case
             if (replicaGetIndices == null) {
-              replicaGetIndices = new ArrayList<Integer>(actions.size() - 1);
+              replicaGetIndices = new ArrayList<>(actions.size() - 1);
             }
             replicaGetIndices.add(posInList);
           }
@@ -384,7 +383,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
           if (posInList > 0) {
             // Add all the previous requests to the index lists. We know they are all
             // replica-gets because this is the first non-multi-replica request in the list.
-            replicaGetIndices = new ArrayList<Integer>(actions.size() - 1);
+            replicaGetIndices = new ArrayList<>(actions.size() - 1);
             for (int i = 0; i < posInList; ++i) {
               replicaGetIndices.add(i);
             }
@@ -445,8 +444,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
    * @param numAttempt - the current numAttempt (first attempt is 1)
    */
   void groupAndSendMultiAction(List<Action> currentActions, int numAttempt) {
-    Map<ServerName, MultiAction> actionsByServer =
-        new HashMap<ServerName, MultiAction>();
+    Map<ServerName, MultiAction> actionsByServer = new HashMap<>();
 
     boolean isReplica = false;
     List<Action> unknownReplicaActions = null;
@@ -463,7 +461,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
       if (loc == null || loc.getServerName() == null) {
         if (isReplica) {
           if (unknownReplicaActions == null) {
-            unknownReplicaActions = new ArrayList<Action>(1);
+            unknownReplicaActions = new ArrayList<>(1);
           }
           unknownReplicaActions.add(action);
         } else {
@@ -485,7 +483,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
     }
 
     if (hasUnknown) {
-      actionsByServer = new HashMap<ServerName, MultiAction>();
+      actionsByServer = new HashMap<>();
       for (Action action : unknownReplicaActions) {
         HRegionLocation loc = getReplicaLocationOrFail(action);
         if (loc == null) continue;
@@ -616,8 +614,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
     }
 
     // group the actions by the amount of delay
-    Map<Long, DelayingRunner> actions = new HashMap<Long, DelayingRunner>(multiAction
-        .size());
+    Map<Long, DelayingRunner> actions = new HashMap<>(multiAction.size());
 
     // split up the actions
     for (Map.Entry<byte[], List<Action>> e : multiAction.actions.entrySet()) {
@@ -630,7 +627,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
       }
     }
 
-    List<Runnable> toReturn = new ArrayList<Runnable>(actions.size());
+    List<Runnable> toReturn = new ArrayList<>(actions.size());
     for (DelayingRunner runner : actions.values()) {
       asyncProcess.incTaskCounters(runner.getActions().getRegions(), server);
       String traceText = "AsyncProcess.sendMultiAction";
@@ -736,7 +733,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
       asyncProcess.connection.clearCaches(server);
     }
     int failed = 0, stopped = 0;
-    List<Action> toReplay = new ArrayList<Action>();
+    List<Action> toReplay = new ArrayList<>();
     for (Map.Entry<byte[], List<Action>> e : rsActions.actions.entrySet()) {
       byte[] regionName = e.getKey();
       byte[] row = e.getValue().iterator().next().getAction().getRow();
@@ -850,7 +847,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
     //  - DoNotRetryIOException: we continue to retry for other actions
     //  - RegionMovedException: we update the cache with the new region location
 
-    List<Action> toReplay = new ArrayList<Action>();
+    List<Action> toReplay = new ArrayList<>();
     Throwable throwable = null;
     int failureCount = 0;
     boolean canRetry = true;

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
index 9bc651d..08f52fc 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
@@ -295,7 +295,7 @@ class AsyncRpcRetryingCallerFactory {
     }
 
     public <T> AsyncBatchRpcRetryingCaller<T> build() {
-      return new AsyncBatchRpcRetryingCaller<T>(retryTimer, conn, tableName, actions, pauseNs,
+      return new AsyncBatchRpcRetryingCaller<>(retryTimer, conn, tableName, actions, pauseNs,
           maxAttempts, operationTimeoutNs, rpcTimeoutNs, startLogErrorsCnt);
     }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BatchErrors.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BatchErrors.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BatchErrors.java
index b13c127..95b3484 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BatchErrors.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BatchErrors.java
@@ -28,9 +28,9 @@ import java.util.List;
 
 class BatchErrors {
   private static final Log LOG = LogFactory.getLog(BatchErrors.class);
-  final List<Throwable> throwables = new ArrayList<Throwable>();
-  final List<Row> actions = new ArrayList<Row>();
-  final List<String> addresses = new ArrayList<String>();
+  final List<Throwable> throwables = new ArrayList<>();
+  final List<Row> actions = new ArrayList<>();
+  final List<String> addresses = new ArrayList<>();
 
   public synchronized void add(Throwable ex, Row row, ServerName serverName) {
     if (row == null){
@@ -51,8 +51,8 @@ class BatchErrors {
       LOG.error("Exception occurred! Exception details: " + throwables + ";\nActions: "
               + actions);
     }
-    return new RetriesExhaustedWithDetailsException(new ArrayList<Throwable>(throwables),
-            new ArrayList<Row>(actions), new ArrayList<String>(addresses));
+    return new RetriesExhaustedWithDetailsException(new ArrayList<>(throwables),
+            new ArrayList<>(actions), new ArrayList<>(addresses));
   }
 
   public synchronized void clear() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java
index f632bcb..b1fc2da 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java
@@ -76,9 +76,9 @@ public class ClientAsyncPrefetchScanner extends ClientSimpleScanner {
   protected void initCache() {
     // concurrent cache
     cacheCapacity = calcCacheCapacity();
-    cache = new LinkedBlockingQueue<Result>();
+    cache = new LinkedBlockingQueue<>();
     cacheSizeInBytes = new AtomicLong(0);
-    exceptionsQueue = new ConcurrentLinkedQueue<Exception>();
+    exceptionsQueue = new ConcurrentLinkedQueue<>();
     prefetchRunnable = new PrefetchRunnable();
     prefetchRunning = new AtomicBoolean(false);
     closingThreadId = new AtomicLong(NO_THREAD);

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
index 9be4d6d..53e6dd8 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
@@ -75,8 +75,9 @@ public abstract class ClientScanner extends AbstractClientScanner {
    * contain results if this scanner does not have enough partial results to form the complete
    * result.
    */
-  protected final LinkedList<Result> partialResults = new LinkedList<Result>();
   protected int partialResultsCellSizes = 0;
+  protected final LinkedList<Result> partialResults = new LinkedList<>();
+
   /**
    * The row for which we are accumulating partial Results (i.e. the row of the Results stored
    * inside partialResults). Changes to partialResultsRow and partialResults are kept in sync via
@@ -313,7 +314,7 @@ public abstract class ClientScanner extends AbstractClientScanner {
   }
 
   protected void initSyncCache() {
-    cache = new LinkedList<Result>();
+    cache = new LinkedList<>();
   }
 
   protected Result nextWithSyncCache() throws IOException {
@@ -587,7 +588,7 @@ public abstract class ClientScanner extends AbstractClientScanner {
   protected List<Result> getResultsToAddToCache(Result[] resultsFromServer,
       boolean heartbeatMessage) throws IOException {
     int resultSize = resultsFromServer != null ? resultsFromServer.length : 0;
-    List<Result> resultsToAddToCache = new ArrayList<Result>(resultSize);
+    List<Result> resultsToAddToCache = new ArrayList<>(resultSize);
 
     // If the caller has indicated in their scan that they are okay with seeing partial results,
     // then simply add all results to the list. Note allowPartial and setBatch are not same, we can

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java
index f3c0241..240587b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java
@@ -64,7 +64,7 @@ import org.apache.hadoop.hbase.util.Threads;
 @InterfaceAudience.Private
 class ClusterStatusListener implements Closeable {
   private static final Log LOG = LogFactory.getLog(ClusterStatusListener.class);
-  private final List<ServerName> deadServers = new ArrayList<ServerName>();
+  private final List<ServerName> deadServers = new ArrayList<>();
   protected final DeadServerHandler deadServerHandler;
   private final Listener listener;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
index 0fb9758..adf1496 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
@@ -415,7 +415,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
     BlockingQueue<Runnable> workQueue = passedWorkQueue;
     if (workQueue == null) {
       workQueue =
-        new LinkedBlockingQueue<Runnable>(maxThreads *
+        new LinkedBlockingQueue<>(maxThreads *
             conf.getInt(HConstants.HBASE_CLIENT_MAX_TOTAL_TASKS,
                 HConstants.DEFAULT_HBASE_CLIENT_MAX_TOTAL_TASKS));
       coreThreads = maxThreads;
@@ -443,7 +443,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
           this.metaLookupPool = getThreadPool(
              threads,
              threads,
-             "-metaLookup-shared-", new LinkedBlockingQueue<Runnable>());
+             "-metaLookup-shared-", new LinkedBlockingQueue<>());
         }
       }
     }
@@ -661,7 +661,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
       final boolean useCache, final boolean offlined) throws IOException {
     List<HRegionInfo> regions = MetaTableAccessor
         .getTableRegions(this, tableName, !offlined);
-    final List<HRegionLocation> locations = new ArrayList<HRegionLocation>();
+    final List<HRegionLocation> locations = new ArrayList<>();
     for (HRegionInfo regionInfo : regions) {
       RegionLocations list = locateRegion(tableName, regionInfo.getStartKey(), useCache, true);
       if (list != null) {
@@ -967,7 +967,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
   }
 
   // Map keyed by service name + regionserver to service stub implementation
-  private final ConcurrentMap<String, Object> stubs = new ConcurrentHashMap<String, Object>();
+  private final ConcurrentMap<String, Object> stubs = new ConcurrentHashMap<>();
 
   /**
    * State of the MasterService connection/setup.
@@ -1012,8 +1012,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
    */
   static class ServerErrorTracker {
     // We need a concurrent map here, as we could have multiple threads updating it in parallel.
-    private final ConcurrentMap<ServerName, ServerErrors> errorsByServer =
-        new ConcurrentHashMap<ServerName, ServerErrors>();
+    private final ConcurrentMap<ServerName, ServerErrors> errorsByServer = new ConcurrentHashMap<>();
     private final long canRetryUntil;
     private final int maxTries;// max number to try
     private final long startTrackingTime;

http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
index 9c6c1a5..0eb1d2b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
@@ -172,7 +172,7 @@ public class Delete extends Mutation implements Comparable<Row> {
     byte [] family = CellUtil.cloneFamily(kv);
     List<Cell> list = familyMap.get(family);
     if (list == null) {
-      list = new ArrayList<Cell>(1);
+      list = new ArrayList<>(1);
     }
     list.add(kv);
     familyMap.put(family, list);
@@ -209,7 +209,7 @@ public class Delete extends Mutation implements Comparable<Row> {
     }
     List<Cell> list = familyMap.get(family);
     if(list == null) {
-      list = new ArrayList<Cell>(1);
+      list = new ArrayList<>(1);
     } else if(!list.isEmpty()) {
       list.clear();
     }
@@ -229,7 +229,7 @@ public class Delete extends Mutation implements Comparable<Row> {
   public Delete addFamilyVersion(final byte [] family, final long timestamp) {
     List<Cell> list = familyMap.get(family);
     if(list == null) {
-      list = new ArrayList<Cell>(1);
+      list = new ArrayList<>(1);
     }
     list.add(new KeyValue(row, family, null, timestamp,
           KeyValue.Type.DeleteFamilyVersion));
@@ -262,7 +262,7 @@ public class Delete extends Mutation implements Comparable<Row> {
     }
     List<Cell> list = familyMap.get(family);
     if (list == null) {
-      list = new ArrayList<Cell>(1);
+      list = new ArrayList<>(1);
     }
     list.add(new KeyValue(this.row, family, qualifier, timestamp,
         KeyValue.Type.DeleteColumn));
@@ -297,7 +297,7 @@ public class Delete extends Mutation implements Comparable<Row> {
     }
     List<Cell> list = familyMap.get(family);
     if(list == null) {
-      list = new ArrayList<Cell>(1);
+      list = new ArrayList<>(1);
     }
     KeyValue kv = new KeyValue(this.row, family, qualifier, timestamp, KeyValue.Type.Delete);
     list.add(kv);


Mime
View raw message