From 94a00bea07b71f2383805e966748e504b406b95d Mon Sep 17 00:00:00 2001 From: Usha Kuchibhotla Date: Tue, 28 Apr 2015 16:54:36 +0530 Subject: [PATCH] HBASE-11677 Making Logger instance modifiers consistent. * IA.Public accessible logger instances deprecated * logger instances modified by tests left in place * all others made private static final Signed-off-by: Sean Busbey --- .../java/org/apache/hadoop/hbase/client/AsyncProcess.java | 2 +- .../org/apache/hadoop/hbase/client/ClientIdGenerator.java | 2 +- .../java/org/apache/hadoop/hbase/client/ClientScanner.java | 2 +- .../org/apache/hadoop/hbase/client/ClientSmallScanner.java | 2 +- .../apache/hadoop/hbase/client/ConnectionImplementation.java | 2 +- .../hadoop/hbase/client/PreemptiveFastFailInterceptor.java | 2 +- .../org/apache/hadoop/hbase/client/RegionServerCallable.java | 2 +- .../apache/hadoop/hbase/client/RpcRetryingCallerImpl.java | 1 + .../hbase/client/RpcRetryingCallerWithReadReplicas.java | 2 +- .../java/org/apache/hadoop/hbase/client/ScannerCallable.java | 1 + .../hadoop/hbase/client/ScannerCallableWithReplicas.java | 2 +- .../org/apache/hadoop/hbase/client/ZooKeeperRegistry.java | 2 +- .../apache/hadoop/hbase/filter/SingleColumnValueFilter.java | 2 +- .../java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java | 3 ++- .../src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java | 4 ++-- .../java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java | 2 +- .../java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java | 5 +++++ .../apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java | 4 ++-- .../org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java | 1 + .../apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java | 2 +- .../apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java | 2 +- .../hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java | 2 +- .../main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java | 4 ++++ .../org/apache/hadoop/hbase/protobuf/ResponseConverter.java | 2 +- .../org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java | 2 +- .../org/apache/hadoop/hbase/security/SaslClientHandler.java | 4 ++-- .../apache/hadoop/hbase/security/access/TablePermission.java | 2 +- .../apache/hadoop/hbase/security/access/UserPermission.java | 2 +- .../hbase/security/token/AuthenticationTokenSelector.java | 2 +- .../org/apache/hadoop/hbase/security/token/TokenUtil.java | 2 +- .../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java | 2 +- .../apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java | 3 ++- .../java/org/apache/hadoop/hbase/TestHTableDescriptor.java | 2 +- .../org/apache/hadoop/hbase/client/TestAsyncProcess.java | 3 +++ .../test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ChoreService.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/KeyValue.java | 2 +- .../main/java/org/apache/hadoop/hbase/ScheduledChore.java | 2 +- .../org/apache/hadoop/hbase/io/BoundedByteBufferPool.java | 4 ++-- .../org/apache/hadoop/hbase/io/compress/Compression.java | 2 +- .../java/org/apache/hadoop/hbase/util/ByteBufferArray.java | 2 +- .../main/java/org/apache/hadoop/hbase/util/ClassSize.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/Methods.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/Sleeper.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/Threads.java | 2 +- .../test/java/org/apache/hadoop/hbase/TestChoreService.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestKeyValue.java | 2 +- .../hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java | 2 +- .../java/org/apache/hadoop/hbase/IntegrationTestIngest.java | 1 + .../hadoop/hbase/IntegrationTestIngestWithEncryption.java | 4 +++- .../org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java | 2 +- .../java/org/apache/hadoop/hbase/chaos/actions/Action.java | 2 +- .../hbase/chaos/actions/RollingBatchRestartRsAction.java | 2 +- .../java/org/apache/hadoop/hbase/chaos/policies/Policy.java | 2 +- .../hadoop/hbase/mapreduce/IntegrationTestImportTsv.java | 2 +- .../main/java/org/apache/hadoop/hbase/rest/RESTServlet.java | 2 +- .../test/java/org/apache/hadoop/hbase/rest/DummyFilter.java | 2 +- .../apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java | 2 +- .../org/apache/hadoop/hbase/rest/TestStatusResource.java | 2 +- .../main/java/org/apache/hadoop/hbase/HealthCheckChore.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/HealthChecker.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/JMXListener.java | 2 +- .../main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java | 2 +- .../java/org/apache/hadoop/hbase/ZKNamespaceManager.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java | 2 +- .../org/apache/hadoop/hbase/conf/ConfigurationManager.java | 2 +- .../hbase/errorhandling/ForeignExceptionDispatcher.java | 2 +- .../java/org/apache/hadoop/hbase/http/HttpRequestLog.java | 2 +- .../main/java/org/apache/hadoop/hbase/http/HttpServer.java | 2 +- .../java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java | 2 +- .../main/java/org/apache/hadoop/hbase/io/hfile/HFile.java | 1 + .../java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java | 2 +- .../apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java | 2 +- .../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java | 2 +- .../main/java/org/apache/hadoop/hbase/ipc/CallRunner.java | 4 ++++ .../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java | 1 + .../java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java | 2 +- .../apache/hadoop/hbase/mapred/TableRecordReaderImpl.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java | 2 +- .../apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java | 2 +- .../hadoop/hbase/mapreduce/MultiTableInputFormatBase.java | 2 +- .../apache/hadoop/hbase/mapreduce/TableInputFormatBase.java | 2 +- .../apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 2 +- .../apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java | 2 +- .../java/org/apache/hadoop/hbase/mapreduce/TableSplit.java | 2 ++ .../java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java | 2 +- .../hadoop/hbase/master/AssignmentVerificationReport.java | 2 +- .../org/apache/hadoop/hbase/master/MasterRpcServices.java | 2 +- .../java/org/apache/hadoop/hbase/master/MetricsMaster.java | 2 +- .../java/org/apache/hadoop/hbase/master/RackManager.java | 2 +- .../hadoop/hbase/master/balancer/FavoredNodesPlan.java | 2 +- .../hadoop/hbase/master/balancer/RegionLocationFinder.java | 2 +- .../org/apache/hadoop/hbase/master/cleaner/LogCleaner.java | 2 +- .../hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java | 2 +- .../hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java | 2 +- .../org/apache/hadoop/hbase/namespace/NamespaceAuditor.java | 2 +- .../apache/hadoop/hbase/namespace/NamespaceStateManager.java | 2 +- .../hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java | 2 +- .../regionserver/AnnotationReadingPriorityFunction.java | 2 +- .../apache/hadoop/hbase/regionserver/CompactSplitThread.java | 2 +- .../hadoop/hbase/regionserver/DefaultStoreFileManager.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +- .../apache/hadoop/hbase/regionserver/HRegionFileSystem.java | 2 +- .../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/HStore.java | 2 +- .../IncreasingToUpperBoundRegionSplitPolicy.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/LogRoller.java | 2 +- .../org/apache/hadoop/hbase/regionserver/LruHashMap.java | 2 +- .../apache/hadoop/hbase/regionserver/MemStoreFlusher.java | 2 +- .../hbase/regionserver/MetricsRegionServerWrapperImpl.java | 2 +- .../apache/hadoop/hbase/regionserver/RegionMergeRequest.java | 2 +- .../org/apache/hadoop/hbase/regionserver/ScannerContext.java | 4 ++-- .../org/apache/hadoop/hbase/regionserver/SplitRequest.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/StoreFile.java | 4 ++-- .../org/apache/hadoop/hbase/regionserver/StoreFileInfo.java | 2 +- .../apache/hadoop/hbase/regionserver/StoreFileScanner.java | 2 +- .../org/apache/hadoop/hbase/regionserver/StoreScanner.java | 2 +- .../apache/hadoop/hbase/regionserver/StripeStoreConfig.java | 2 +- .../apache/hadoop/hbase/regionserver/StripeStoreEngine.java | 2 +- .../hadoop/hbase/regionserver/StripeStoreFileManager.java | 2 +- .../regionserver/compactions/CompactionConfiguration.java | 2 +- .../hbase/regionserver/compactions/CompactionRequest.java | 2 +- .../org/apache/hadoop/hbase/regionserver/wal/FSHLog.java | 2 +- .../org/apache/hadoop/hbase/regionserver/wal/HLogKey.java | 2 +- .../org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java | 2 +- .../hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java | 2 +- .../hadoop/hbase/regionserver/wal/ProtobufLogWriter.java | 2 +- .../org/apache/hadoop/hbase/regionserver/wal/WALEdit.java | 2 +- .../org/apache/hadoop/hbase/regionserver/wal/WALUtil.java | 2 +- .../hadoop/hbase/replication/regionserver/MetricsSource.java | 2 +- .../hbase/replication/regionserver/ReplicationSource.java | 2 +- .../hbase/replication/regionserver/ReplicationSyncUp.java | 2 +- .../org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java | 2 +- .../hadoop/hbase/security/access/AccessControlLists.java | 2 +- .../hadoop/hbase/security/access/AccessController.java | 2 +- .../security/access/HbaseObjectWritableFor96Migration.java | 2 +- .../hadoop/hbase/security/access/SecureBulkLoadEndpoint.java | 2 +- .../hadoop/hbase/security/access/TableAuthManager.java | 2 +- .../hadoop/hbase/security/access/ZKPermissionWatcher.java | 2 +- .../security/token/AuthenticationTokenSecretManager.java | 2 +- .../apache/hadoop/hbase/security/token/TokenProvider.java | 2 +- .../apache/hadoop/hbase/security/token/ZKSecretWatcher.java | 2 +- .../apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java | 2 +- .../apache/hadoop/hbase/util/CompoundBloomFilterWriter.java | 2 +- .../java/org/apache/hadoop/hbase/util/CompressionTest.java | 2 +- .../java/org/apache/hadoop/hbase/util/ConnectionCache.java | 2 +- .../java/org/apache/hadoop/hbase/util/EncryptionTest.java | 2 +- .../java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/HMerge.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/Merge.java | 2 +- .../org/apache/hadoop/hbase/util/RegionSplitCalculator.java | 2 +- .../java/org/apache/hadoop/hbase/util/RegionSplitter.java | 4 ++-- .../src/main/java/org/apache/hadoop/hbase/wal/WALKey.java | 2 +- .../main/java/org/apache/hadoop/hbase/wal/WALSplitter.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/HBaseCluster.java | 1 + .../org/apache/hadoop/hbase/HFilePerformanceEvaluation.java | 2 +- .../apache/hadoop/hbase/MapFilePerformanceEvaluation.java | 2 +- .../test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java | 2 +- .../java/org/apache/hadoop/hbase/MultithreadedTestUtil.java | 2 +- .../java/org/apache/hadoop/hbase/PerformanceEvaluation.java | 2 +- .../apache/hadoop/hbase/PerformanceEvaluationCommons.java | 2 +- .../java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java | 2 +- .../org/apache/hadoop/hbase/TestHBaseTestingUtility.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestIOFencing.java | 2 +- .../test/java/org/apache/hadoop/hbase/TestInfoServers.java | 2 +- .../org/apache/hadoop/hbase/TestMovedRegionsCleaner.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestNamespace.java | 2 +- .../java/org/apache/hadoop/hbase/TestRegionRebalancing.java | 2 +- .../java/org/apache/hadoop/hbase/TestTableDescriptor.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java | 2 +- .../test/java/org/apache/hadoop/hbase/client/TestAdmin1.java | 2 +- .../test/java/org/apache/hadoop/hbase/client/TestAdmin2.java | 2 +- .../hadoop/hbase/client/TestClientScannerRPCTimeout.java | 2 +- .../org/apache/hadoop/hbase/client/TestClientTimeouts.java | 2 +- .../hadoop/hbase/client/TestCloneSnapshotFromClient.java | 2 +- .../java/org/apache/hadoop/hbase/client/TestFastFail.java | 2 +- .../org/apache/hadoop/hbase/client/TestFromClientSide.java | 2 +- .../org/apache/hadoop/hbase/client/TestFromClientSide3.java | 2 +- .../apache/hadoop/hbase/client/TestHTableMultiplexer.java | 2 +- .../hadoop/hbase/client/TestHTableMultiplexerFlushCache.java | 2 +- .../org/apache/hadoop/hbase/client/TestMetaWithReplicas.java | 2 +- .../apache/hadoop/hbase/client/TestMultipleTimestamps.java | 2 +- .../hadoop/hbase/client/TestRestoreSnapshotFromClient.java | 2 +- .../org/apache/hadoop/hbase/client/TestScannerTimeout.java | 2 +- .../org/apache/hadoop/hbase/client/TestSizeFailures.java | 2 +- .../org/apache/hadoop/hbase/client/TestTimestampsFilter.java | 2 +- .../java/org/apache/hadoop/hbase/codec/CodecPerformance.java | 2 ++ .../org/apache/hadoop/hbase/codec/TestCellMessageCodec.java | 2 +- .../apache/hadoop/hbase/conf/TestConfigurationManager.java | 2 +- .../hadoop/hbase/coprocessor/ColumnAggregationEndpoint.java | 2 +- .../coprocessor/ColumnAggregationEndpointNullResponse.java | 2 +- .../coprocessor/ColumnAggregationEndpointWithErrors.java | 2 +- .../hadoop/hbase/coprocessor/SimpleRegionObserver.java | 2 +- .../hadoop/hbase/coprocessor/TestCoprocessorInterface.java | 2 +- .../hbase/coprocessor/TestRegionObserverInterface.java | 2 +- .../TestRegionServerCoprocessorExceptionWithAbort.java | 5 +++-- .../hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java | 2 +- .../apache/hadoop/hbase/filter/TestColumnRangeFilter.java | 2 +- .../hadoop/hbase/filter/TestDependentColumnFilter.java | 2 +- .../hbase/filter/TestFuzzyRowAndColumnRangeFilter.java | 2 +- .../apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java | 4 ++-- .../java/org/apache/hadoop/hbase/http/TestGlobalFilter.java | 2 +- .../java/org/apache/hadoop/hbase/http/TestHttpServer.java | 2 +- .../java/org/apache/hadoop/hbase/http/TestPathFilter.java | 2 +- .../java/org/apache/hadoop/hbase/http/TestServletFilter.java | 2 +- .../apache/hadoop/hbase/http/resource/JerseyResource.java | 2 +- .../test/java/org/apache/hadoop/hbase/io/TestHeapSize.java | 2 +- .../java/org/apache/hadoop/hbase/io/hfile/TestHFile.java | 2 +- .../org/apache/hadoop/hbase/ipc/TestRpcHandlerException.java | 2 +- .../org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java | 2 +- .../apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java | 2 +- .../hadoop/hbase/mapreduce/TestHFileOutputFormat2.java | 2 +- .../mapreduce/TestImportTSVWithOperationAttributes.java | 2 +- .../hbase/mapreduce/TestImportTSVWithVisibilityLabels.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/TestImportTsv.java | 2 +- .../mapreduce/TestLoadIncrementalHFilesSplitRecovery.java | 4 ++-- .../hadoop/hbase/mapreduce/TestMultiTableInputFormat.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/TestRowCounter.java | 2 +- .../hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java | 2 +- .../apache/hadoop/hbase/mapreduce/TestWALRecordReader.java | 2 +- .../hbase/master/TestMasterOperationsForRegionReplicas.java | 2 +- .../org/apache/hadoop/hbase/master/TestMasterShutdown.java | 4 ++-- .../org/apache/hadoop/hbase/master/TestRegionPlacement.java | 2 +- .../org/apache/hadoop/hbase/master/TestRegionPlacement2.java | 2 +- .../org/apache/hadoop/hbase/master/TestWarmupRegion.java | 2 +- .../apache/hadoop/hbase/procedure/TestProcedureManager.java | 2 +- .../hadoop/hbase/procedure/TestZKProcedureControllers.java | 2 +- .../java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java | 4 ++-- .../org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java | 4 ++-- .../hadoop/hbase/regionserver/TestAtomicOperation.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestBlocksRead.java | 2 +- .../apache/hadoop/hbase/regionserver/TestColumnSeeking.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestCompaction.java | 2 +- .../hadoop/hbase/regionserver/TestCompactionState.java | 2 +- .../hadoop/hbase/regionserver/TestDefaultMemStore.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestHRegion.java | 2 +- .../hadoop/hbase/regionserver/TestHRegionReplayEvents.java | 2 +- .../hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java | 2 +- .../apache/hadoop/hbase/regionserver/TestJoinedScanners.java | 2 +- .../hadoop/hbase/regionserver/TestMajorCompaction.java | 2 +- .../hadoop/hbase/regionserver/TestMinorCompaction.java | 2 +- .../apache/hadoop/hbase/regionserver/TestParallelPut.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestScanner.java | 2 +- .../hbase/regionserver/TestScannerHeartbeatMessages.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/TestStore.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestStoreFile.java | 2 +- .../apache/hadoop/hbase/regionserver/TestWideScanner.java | 2 +- .../hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java | 2 +- .../org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java | 2 +- .../hadoop/hbase/regionserver/wal/TestProtobufLog.java | 2 +- .../hbase/regionserver/wal/TestWALActionsListener.java | 2 +- .../apache/hadoop/hbase/regionserver/wal/TestWALReplay.java | 2 +- .../hadoop/hbase/replication/TestReplicationEndpoint.java | 2 +- .../test/java/org/apache/hadoop/hbase/security/TestUser.java | 2 +- .../hadoop/hbase/security/token/TestTokenAuthentication.java | 4 ++-- .../hadoop/hbase/security/token/TestZKSecretWatcher.java | 2 +- .../TestVisibilityLabelsWithDefaultVisLabelService.java | 3 ++- .../org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java | 2 +- .../hbase/snapshot/TestRestoreFlushSnapshotFromClient.java | 2 +- .../hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java | 2 +- .../test/java/org/apache/hadoop/hbase/util/MockServer.java | 2 +- .../org/apache/hadoop/hbase/util/TestCompressionTest.java | 2 +- .../apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java | 2 +- .../java/org/apache/hadoop/hbase/util/TestFSVisitor.java | 2 +- .../java/org/apache/hadoop/hbase/util/TestHBaseFsck.java | 3 +-- .../java/org/apache/hadoop/hbase/util/TestMergeTool.java | 2 +- .../hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java | 2 +- .../hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java | 5 ++++- .../hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java | 5 ++++- .../hbase/util/hbck/TestOfflineMetaRebuildOverlap.java | 5 ++++- .../org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java | 2 +- .../test/java/org/apache/hadoop/hbase/wal/TestSecureWAL.java | 2 +- .../java/org/apache/hadoop/hbase/wal/TestWALFactory.java | 2 +- .../apache/hadoop/hbase/wal/TestWALReaderOnSecureWAL.java | 2 +- .../apache/hadoop/hbase/wal/WALPerformanceEvaluation.java | 2 +- .../apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java | 2 +- .../main/java/org/apache/hadoop/hbase/thrift/CallQueue.java | 2 +- .../apache/hadoop/hbase/thrift/HbaseHandlerMetricsProxy.java | 2 +- .../org/apache/hadoop/hbase/thrift/IncrementCoalescer.java | 2 +- .../org/apache/hadoop/hbase/thrift/ThriftHttpServlet.java | 2 +- .../org/apache/hadoop/hbase/thrift/ThriftServerRunner.java | 2 +- .../java/org/apache/hadoop/hbase/thrift/TestCallQueue.java | 2 +- .../org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java | 2 +- .../apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java | 2 +- .../hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java | 2 +- .../thrift2/TestThriftHBaseServiceHandlerWithLabels.java | 2 +- 287 files changed, 330 insertions(+), 289 deletions(-) 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 10f23303dbf..0150a2e008a 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 @@ -96,7 +96,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private class AsyncProcess { - protected static final Log LOG = LogFactory.getLog(AsyncProcess.class); + private static final Log LOG = LogFactory.getLog(AsyncProcess.class); protected static final AtomicLong COUNTER = new AtomicLong(); public static final String PRIMARY_CALL_TIMEOUT_KEY = "hbase.client.primaryCallTimeout.multiget"; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java index 7c859a12901..49e1765996c 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java @@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.util.Bytes; */ @InterfaceAudience.Private final class ClientIdGenerator { - static final Log LOG = LogFactory.getLog(ClientIdGenerator.class); + private static final Log LOG = LogFactory.getLog(ClientIdGenerator.class); private ClientIdGenerator() {} 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 d81a3980399..01ce47f9d08 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 @@ -54,7 +54,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private public class ClientScanner extends AbstractClientScanner { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ClientScanner.class); // A byte array in which all elements are the max byte, and it is used to // construct closest front row static byte[] MAX_BYTE_ARRAY = Bytes.createMaxByteArray(9); diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java index 77321b012db..8e4a0d8d6e5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java @@ -51,7 +51,7 @@ import com.google.protobuf.ServiceException; */ @InterfaceAudience.Private public class ClientSmallScanner extends ClientScanner { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ClientSmallScanner.class); private ScannerCallableWithReplicas smallScanCallable = null; private SmallScannerCallableFactory callableFactory; 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 696a6c93b03..35ff34fecb4 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 @@ -98,7 +98,7 @@ import java.util.concurrent.atomic.AtomicInteger; @InterfaceAudience.Private class ConnectionImplementation implements ClusterConnection, Closeable { public static final String RETRIES_BY_SERVER_KEY = "hbase.client.retries.by.server"; - static final Log LOG = LogFactory.getLog(ConnectionImplementation.class); + private static final Log LOG = LogFactory.getLog(ConnectionImplementation.class); private static final String CLIENT_NONCES_ENABLED_KEY = "hbase.client.nonces.enabled"; private final long pause; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java index 6fb2de34c1a..64cd03dfab6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java @@ -73,7 +73,7 @@ import org.apache.hadoop.ipc.RemoteException; @InterfaceAudience.Private class PreemptiveFastFailInterceptor extends RetryingCallerInterceptor { - public static final Log LOG = LogFactory + private static final Log LOG = LogFactory .getLog(PreemptiveFastFailInterceptor.class); // amount of time to wait before we consider a server to be in fast fail diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java index 74d699f2422..9989d56d8e9 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java @@ -47,7 +47,7 @@ import org.apache.hadoop.hbase.util.Bytes; @InterfaceAudience.Private public abstract class RegionServerCallable implements RetryingCallable { // Public because used outside of this package over in ipc. - static final Log LOG = LogFactory.getLog(RegionServerCallable.class); + private static final Log LOG = LogFactory.getLog(RegionServerCallable.class); protected final Connection connection; protected final TableName tableName; protected final byte[] row; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java index 03138ec8c4d..dd56b17f9b5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java @@ -49,6 +49,7 @@ import com.google.protobuf.ServiceException; */ @InterfaceAudience.Private public class RpcRetryingCallerImpl implements RpcRetryingCaller { + // LOG is being used in TestMultiRowRangeFilter, hence leaving it public public static final Log LOG = LogFactory.getLog(RpcRetryingCallerImpl.class); /** * When we started making calls. diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java index 273a1e1d767..8f288818852 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java @@ -59,7 +59,7 @@ import com.google.protobuf.ServiceException; */ @InterfaceAudience.Private public class RpcRetryingCallerWithReadReplicas { - static final Log LOG = LogFactory.getLog(RpcRetryingCallerWithReadReplicas.class); + private static final Log LOG = LogFactory.getLog(RpcRetryingCallerWithReadReplicas.class); protected final ExecutorService pool; protected final ClusterConnection cConnection; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java index b53c9d684a6..6ef4fc41b56 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java @@ -64,6 +64,7 @@ public class ScannerCallable extends RegionServerCallable { = "hbase.client.log.scanner.latency.cutoff"; public static final String LOG_SCANNER_ACTIVITY = "hbase.client.log.scanner.activity"; + // Keeping LOG public as it is being used in TestScannerHeartbeatMessages public static final Log LOG = LogFactory.getLog(ScannerCallable.class); protected long scannerId = -1L; protected boolean instantiated = false; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java index d6728521de9..1708efe08c2 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java @@ -60,7 +60,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private class ScannerCallableWithReplicas implements RetryingCallable { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ScannerCallableWithReplicas.class); volatile ScannerCallable currentScannerCallable; AtomicBoolean replicaSwitched = new AtomicBoolean(false); final ClusterConnection cConnection; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java index 8cc7160267e..5aabb0cbfc2 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java @@ -35,7 +35,7 @@ import org.apache.zookeeper.KeeperException; * A cluster registry that stores to zookeeper. */ class ZooKeeperRegistry implements Registry { - static final Log LOG = LogFactory.getLog(ZooKeeperRegistry.class); + private static final Log LOG = LogFactory.getLog(ZooKeeperRegistry.class); // Needs an instance of hci to function. Set after construct this instance. ConnectionImplementation hci; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java index d905868301a..2fcbf4f57bd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java @@ -71,7 +71,7 @@ import com.google.protobuf.InvalidProtocolBufferException; @InterfaceAudience.Public @InterfaceStability.Stable public class SingleColumnValueFilter extends FilterBase { - static final Log LOG = LogFactory.getLog(SingleColumnValueFilter.class); + private static final Log LOG = LogFactory.getLog(SingleColumnValueFilter.class); protected byte [] columnFamily; protected byte [] columnQualifier; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java index c3d2624340b..9be370df5b1 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java @@ -49,6 +49,7 @@ import java.net.SocketAddress; */ @InterfaceAudience.Private public abstract class AbstractRpcClient implements RpcClient { + // Log level is being changed in tests public static final Log LOG = LogFactory.getLog(AbstractRpcClient.class); protected final Configuration conf; @@ -287,4 +288,4 @@ public abstract class AbstractRpcClient implements RpcClient { return this.rpcClient.callBlockingMethod(md, pcrc, param, returnType, this.ticket, this.isa); } } -} \ No newline at end of file +} diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java index 68a494d7689..ec1909a16cd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java @@ -39,7 +39,7 @@ import java.io.IOException; */ @InterfaceAudience.Private public class AsyncCall extends DefaultPromise { - public static final Log LOG = LogFactory.getLog(AsyncCall.class.getName()); + private static final Log LOG = LogFactory.getLog(AsyncCall.class.getName()); final int id; @@ -133,4 +133,4 @@ public class AsyncCall extends DefaultPromise { public long getRpcTimeout() { return rpcTimeout; } -} \ No newline at end of file +} diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java index 32537fa4f82..cfc8b1ba1b9 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java @@ -80,7 +80,7 @@ import com.google.protobuf.RpcCallback; */ @InterfaceAudience.Private public class AsyncRpcChannel { - public static final Log LOG = LogFactory.getLog(AsyncRpcChannel.class.getName()); + private static final Log LOG = LogFactory.getLog(AsyncRpcChannel.class.getName()); private static final int MAX_SASL_RETRIES = 5; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java index 26d6f18d590..2e4d0a66f28 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java @@ -43,6 +43,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.HBaseInterfaceAudience; @@ -68,6 +71,8 @@ import com.google.protobuf.RpcController; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class AsyncRpcClient extends AbstractRpcClient { + private static final Log LOG = LogFactory.getLog(AsyncRpcClient.class); + public static final String CLIENT_MAX_THREADS = "hbase.rpc.client.threads.max"; public static final String USE_NATIVE_TRANSPORT = "hbase.rpc.client.nativetransport"; public static final String USE_GLOBAL_EVENT_LOOP_GROUP = "hbase.rpc.client.globaleventloopgroup"; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java index a900140c25d..1404e6ff5d5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java @@ -38,7 +38,7 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class AsyncServerResponseHandler extends ChannelInboundHandlerAdapter { - public static final Log LOG = LogFactory.getLog(AsyncServerResponseHandler.class.getName()); + private static final Log LOG = LogFactory.getLog(AsyncServerResponseHandler.class.getName()); private final AsyncRpcChannel channel; @@ -123,4 +123,4 @@ public class AsyncServerResponseHandler extends ChannelInboundHandlerAdapter { e.getPort(), doNotRetry) : new RemoteWithExtrasException(innerExceptionClassName, e.getStackTrace(), doNotRetry); } -} \ No newline at end of file +} diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java index 8ec1517b51a..e60fbd6ba04 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java @@ -43,7 +43,7 @@ import com.google.protobuf.ServiceException; @InterfaceAudience.Public @InterfaceStability.Evolving public abstract class CoprocessorRpcChannel implements RpcChannel, BlockingRpcChannel { - private static Log LOG = LogFactory.getLog(CoprocessorRpcChannel.class); + private static final Log LOG = LogFactory.getLog(CoprocessorRpcChannel.class); @Override @InterfaceAudience.Private diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java index 7c6c9ba2fdb..056ecbcbc84 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java @@ -53,6 +53,7 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class IPCUtil { + // LOG is being used in TestIPCUtil public static final Log LOG = LogFactory.getLog(IPCUtil.class); /** * How much we think the decompressor will expand the original compressed content. diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java index 1bef719e34d..622b5f47507 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java @@ -43,7 +43,7 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class MasterCoprocessorRpcChannel extends CoprocessorRpcChannel{ - private static Log LOG = LogFactory.getLog(MasterCoprocessorRpcChannel.class); + private static final Log LOG = LogFactory.getLog(MasterCoprocessorRpcChannel.class); private final HConnection connection; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java index 8433ceebbab..092e24d385a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java @@ -47,7 +47,7 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class RegionCoprocessorRpcChannel extends CoprocessorRpcChannel{ - private static Log LOG = LogFactory.getLog(RegionCoprocessorRpcChannel.class); + private static final Log LOG = LogFactory.getLog(RegionCoprocessorRpcChannel.class); private final HConnection connection; private final TableName table; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java index 027fde4a3af..4d9b9b24c98 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java @@ -37,7 +37,7 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class RegionServerCoprocessorRpcChannel extends CoprocessorRpcChannel { - private static Log LOG = LogFactory.getLog(RegionServerCoprocessorRpcChannel.class); + private static final Log LOG = LogFactory.getLog(RegionServerCoprocessorRpcChannel.class); private final ClusterConnection connection; private final ServerName serverName; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java index c3bcaf9eeca..9a5fc14f872 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java @@ -23,6 +23,9 @@ import com.google.protobuf.Descriptors.MethodDescriptor; import com.google.protobuf.Message; import com.google.protobuf.Message.Builder; import com.google.protobuf.RpcCallback; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.DoNotRetryIOException; @@ -101,6 +104,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ @InterfaceAudience.Private public class RpcClientImpl extends AbstractRpcClient { + private static final Log LOG = LogFactory.getLog(RpcClientImpl.class); protected final AtomicInteger callIdCnt = new AtomicInteger(); protected final PoolMap connections; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java index 65eaddec8f8..858cf323640 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java @@ -63,7 +63,7 @@ import com.google.protobuf.RpcController; */ @InterfaceAudience.Private public final class ResponseConverter { - public static final Log LOG = LogFactory.getLog(ResponseConverter.class); + private static final Log LOG = LogFactory.getLog(ResponseConverter.class); private ResponseConverter() { } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java index 628ec45cc26..ab3ee0e681d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java @@ -55,7 +55,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private public class HBaseSaslRpcClient { - public static final Log LOG = LogFactory.getLog(HBaseSaslRpcClient.class); + private static final Log LOG = LogFactory.getLog(HBaseSaslRpcClient.class); private final SaslClient saslClient; private final boolean fallbackAllowed; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslClientHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslClientHandler.java index 1be59bc7a62..e2c9e025b3f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslClientHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslClientHandler.java @@ -48,7 +48,7 @@ import java.util.Random; */ @InterfaceAudience.Private public class SaslClientHandler extends ChannelDuplexHandler { - public static final Log LOG = LogFactory.getLog(SaslClientHandler.class); + private static final Log LOG = LogFactory.getLog(SaslClientHandler.class); private final boolean fallbackAllowed; @@ -375,4 +375,4 @@ public class SaslClientHandler extends ChannelDuplexHandler { */ public void onSuccess(Channel channel); } -} \ No newline at end of file +} diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java index e4758b0a9da..95d962adc3d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.util.Bytes; */ @InterfaceAudience.Private public class TablePermission extends Permission { - private static Log LOG = LogFactory.getLog(TablePermission.class); + private static final Log LOG = LogFactory.getLog(TablePermission.class); private TableName table; private byte[] family; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java index 73139899c55..09bc33e83fc 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java @@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.util.Bytes; */ @InterfaceAudience.Private public class UserPermission extends TablePermission { - private static Log LOG = LogFactory.getLog(UserPermission.class); + private static final Log LOG = LogFactory.getLog(UserPermission.class); private byte[] user; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java index 2ce2919c6b0..5b871afa62d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java @@ -31,7 +31,7 @@ import org.apache.hadoop.security.token.TokenSelector; @InterfaceAudience.Private public class AuthenticationTokenSelector implements TokenSelector { - private static Log LOG = LogFactory.getLog(AuthenticationTokenSelector.class); + private static final Log LOG = LogFactory.getLog(AuthenticationTokenSelector.class); public AuthenticationTokenSelector() { } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java index 03e657a1e93..9be33d723dd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java @@ -54,7 +54,7 @@ import org.apache.zookeeper.KeeperException; @InterfaceStability.Evolving public class TokenUtil { // This class is referenced indirectly by User out in common; instances are created by reflection - private static Log LOG = LogFactory.getLog(TokenUtil.class); + private static final Log LOG = LogFactory.getLog(TokenUtil.class); /** * Obtain and return an authentication token for the current user. diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java index 495c2bc0bd2..6606cf5f974 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java @@ -41,7 +41,7 @@ import org.apache.zookeeper.KeeperException; @Deprecated @InterfaceAudience.Private public class ZKLeaderManager extends ZooKeeperListener { - private static Log LOG = LogFactory.getLog(ZKLeaderManager.class); + private static final Log LOG = LogFactory.getLog(ZKLeaderManager.class); private final AtomicBoolean leaderExists = new AtomicBoolean(); private String leaderZNode; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java index 1ed1e3fb60c..262432e2099 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java @@ -35,7 +35,8 @@ import org.apache.zookeeper.KeeperException; */ @InterfaceAudience.Private public abstract class ZooKeeperNodeTracker extends ZooKeeperListener { - static final Log LOG = LogFactory.getLog(ZooKeeperNodeTracker.class); + // LOG is being used in subclasses, hence keeping it protected + protected static final Log LOG = LogFactory.getLog(ZooKeeperNodeTracker.class); /** Path of node being tracked */ protected final String node; diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java index 43d94117eef..418afe227b2 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java @@ -41,7 +41,7 @@ import org.junit.experimental.categories.Category; */ @Category({MiscTests.class, SmallTests.class}) public class TestHTableDescriptor { - final static Log LOG = LogFactory.getLog(TestHTableDescriptor.class); + private static final Log LOG = LogFactory.getLog(TestHTableDescriptor.class); @Test public void testPb() throws DeserializationException, IOException { diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java index 52d66d9b405..1460de40a06 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java @@ -39,6 +39,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; @@ -65,6 +67,7 @@ import org.mockito.Mockito; @Category({ClientTests.class, MediumTests.class}) public class TestAsyncProcess { + private final static Log LOG = LogFactory.getLog(TestAsyncProcess.class); private static final TableName DUMMY_TABLE = TableName.valueOf("DUMMY_TABLE"); private static final byte[] DUMMY_BYTES_1 = "DUMMY_BYTES_1".getBytes(); diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java index 3eab225835e..163be7019fa 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java @@ -51,7 +51,7 @@ import org.junit.experimental.categories.Category; @Category({ClientTests.class, SmallTests.class}) public class TestIPCUtil { - public static final Log LOG = LogFactory.getLog(IPCUtil.class); + private static final Log LOG = LogFactory.getLog(TestIPCUtil.class); IPCUtil util; @Before diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java index 17c75f86d03..2519f8fdc03 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java @@ -53,7 +53,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public class ChoreService implements ChoreServicer { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ChoreService.class); /** * The minimum number of threads in the core pool of the underlying ScheduledThreadPoolExecutor diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java index 7de1f54b0fb..9857d8c3c9a 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java @@ -82,7 +82,7 @@ import com.google.common.annotations.VisibleForTesting; public class KeyValue implements Cell, HeapSize, Cloneable, SettableSequenceId, SettableTimestamp { private static final ArrayList EMPTY_ARRAY_LIST = new ArrayList(); - static final Log LOG = LogFactory.getLog(KeyValue.class); + private static final Log LOG = LogFactory.getLog(KeyValue.class); /** * Colon character in UTF-8 diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java index 8670d606127..538b3905bbb 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java @@ -42,7 +42,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private public abstract class ScheduledChore implements Runnable { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ScheduledChore.class); private final String name; diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/BoundedByteBufferPool.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/BoundedByteBufferPool.java index bff0c7734c5..132abf54f4f 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/BoundedByteBufferPool.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/BoundedByteBufferPool.java @@ -46,7 +46,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private public class BoundedByteBufferPool { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(BoundedByteBufferPool.class); @VisibleForTesting final Queue buffers; @@ -110,4 +110,4 @@ public class BoundedByteBufferPool { } } } -} \ No newline at end of file +} diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java index edb4dfa4d38..821b21fdd0f 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java @@ -47,7 +47,7 @@ import org.apache.hadoop.util.ReflectionUtils; */ @InterfaceAudience.Private public final class Compression { - static final Log LOG = LogFactory.getLog(Compression.class); + private static final Log LOG = LogFactory.getLog(Compression.class); /** * Prevent the instantiation of class. diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java index 3d6d260df90..2d9027b278a 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java @@ -34,7 +34,7 @@ import org.apache.hadoop.util.StringUtils; */ @InterfaceAudience.Private public final class ByteBufferArray { - static final Log LOG = LogFactory.getLog(ByteBufferArray.class); + private static final Log LOG = LogFactory.getLog(ByteBufferArray.class); static final int DEFAULT_BUFFER_SIZE = 4 * 1024 * 1024; private ByteBuffer buffers[]; diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java index 1bb34e1ec7e..9f5a88b0628 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public class ClassSize { - static final Log LOG = LogFactory.getLog(ClassSize.class); + private static final Log LOG = LogFactory.getLog(ClassSize.class); private static int nrOfRefsPerObj = 2; diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Methods.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Methods.java index 9ad73b2caf8..51b141842ed 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Methods.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Methods.java @@ -30,7 +30,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; @InterfaceAudience.Private public class Methods { - private static Log LOG = LogFactory.getLog(Methods.class); + private static final Log LOG = LogFactory.getLog(Methods.class); public static Object call(Class clazz, T instance, String methodName, Class[] types, Object[] args) throws Exception { diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java index 4822b0e9516..4ec08204c23 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java @@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public class Sleeper { - private final Log LOG = LogFactory.getLog(this.getClass().getName()); + private static final Log LOG = LogFactory.getLog(Sleeper.class); private final int period; private final Stoppable stopper; private static final long MINIMAL_DELTA_FOR_LOGGING = 10000; diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java index 51a506bc2d7..c366762378d 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java @@ -42,7 +42,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private public class Threads { - protected static final Log LOG = LogFactory.getLog(Threads.class); + private static final Log LOG = LogFactory.getLog(Threads.class); private static final AtomicInteger poolNumber = new AtomicInteger(1); private static UncaughtExceptionHandler LOGGING_EXCEPTION_HANDLER = diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java index 1496dc7111c..14a2cbb4a9d 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java @@ -38,7 +38,7 @@ import org.junit.experimental.categories.Category; @Category(SmallTests.class) public class TestChoreService { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestChoreService.class); /** * A few ScheduledChore samples that are useful for testing with ChoreService diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java index e1de0c3ce47..f1b46c9caec 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java @@ -42,7 +42,7 @@ import org.apache.hadoop.hbase.util.Bytes; import static org.junit.Assert.assertNotEquals; public class TestKeyValue extends TestCase { - private final Log LOG = LogFactory.getLog(this.getClass().getName()); + private static final Log LOG = LogFactory.getLog(TestKeyValue.class); public void testColumnCompare() throws Exception { final byte [] a = Bytes.toBytes("aaa"); diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java index ddd5d456e0a..6e9816a6013 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java @@ -41,7 +41,7 @@ import org.junit.experimental.categories.Category; @Category({MiscTests.class, SmallTests.class}) public class TestKeyStoreKeyProvider { - static final Log LOG = LogFactory.getLog(TestKeyStoreKeyProvider.class); + private static final Log LOG = LogFactory.getLog(TestKeyStoreKeyProvider.class); static final HBaseCommonTestingUtility TEST_UTIL = new HBaseCommonTestingUtility(); static final String ALIAS = "test"; static final String PASSWORD = "password"; diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java index 8495889a3a7..0df4927c1bf 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java @@ -61,6 +61,7 @@ public class IntegrationTestIngest extends IntegrationTestBase { protected static final String NUM_READ_THREADS_KEY = "num_read_threads"; protected static final int DEFAULT_NUM_READ_THREADS = 20; + // Log is being used in IntegrationTestIngestWithEncryption, hence it is protected protected static final Log LOG = LogFactory.getLog(IntegrationTestIngest.class); protected IntegrationTestingUtility util; protected HBaseCluster cluster; diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java index cd1b0b647f3..7460b8309b1 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java @@ -19,6 +19,8 @@ package org.apache.hadoop.hbase; import java.io.IOException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Waiter.Predicate; import org.apache.hadoop.hbase.client.Admin; @@ -40,7 +42,7 @@ import org.junit.experimental.categories.Category; @Category(IntegrationTests.class) public class IntegrationTestIngestWithEncryption extends IntegrationTestIngest { - + private final static Log LOG = LogFactory.getLog(IntegrationTestIngestWithEncryption.class); boolean initialized = false; static { diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java index f682ea17bac..438b17480d8 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java @@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category; */ @Category(IntegrationTests.class) public class IntegrationTestMetaReplicas { - static final Log LOG = LogFactory.getLog(IntegrationTestMetaReplicas.class); + private static final Log LOG = LogFactory.getLog(IntegrationTestMetaReplicas.class); /** * Util to get at the cluster. */ diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java index ebc83ffc333..a3afccdd97b 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java @@ -50,7 +50,7 @@ public class Action { public static final String KILL_RS_TIMEOUT_KEY = "hbase.chaosmonkey.action.killrstimeout"; public static final String START_RS_TIMEOUT_KEY = "hbase.chaosmonkey.action.startrstimeout"; - protected static Log LOG = LogFactory.getLog(Action.class); + protected static final Log LOG = LogFactory.getLog(Action.class); protected static final long KILL_MASTER_TIMEOUT_DEFAULT = PolicyBasedChaosMonkey.TIMEOUT; protected static final long START_MASTER_TIMEOUT_DEFAULT = PolicyBasedChaosMonkey.TIMEOUT; diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java index 4d0cc6b582a..d481b58121b 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java @@ -36,7 +36,7 @@ import org.apache.hadoop.hbase.chaos.monkies.PolicyBasedChaosMonkey; * limits the maximum number of servers that can be down at the same time during rolling restarts. */ public class RollingBatchRestartRsAction extends BatchRestartRsAction { - private static Log LOG = LogFactory.getLog(RollingBatchRestartRsAction.class); + private static final Log LOG = LogFactory.getLog(RollingBatchRestartRsAction.class); protected int maxDeadServers; // number of maximum dead servers at any given time. Defaults to 5 public RollingBatchRestartRsAction(long sleepTime, float ratio) { diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/Policy.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/Policy.java index affaedabe1d..e60d24e591a 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/Policy.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/Policy.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.util.StoppableImplementation; */ public abstract class Policy extends StoppableImplementation implements Runnable { - protected static Log LOG = LogFactory.getLog(Policy.class); + protected static final Log LOG = LogFactory.getLog(Policy.class); protected PolicyContext context; diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java index 3d72447f2bf..4c27ec81a06 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java @@ -63,7 +63,7 @@ import org.junit.experimental.categories.Category; public class IntegrationTestImportTsv implements Configurable, Tool { private static final String NAME = IntegrationTestImportTsv.class.getSimpleName(); - protected static final Log LOG = LogFactory.getLog(IntegrationTestImportTsv.class); + private static final Log LOG = LogFactory.getLog(IntegrationTestImportTsv.class); protected static final String simple_tsv = "row1\t1\tc1\tc2\n" + diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java index 0ecaf5a87d4..1f751a68959 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java @@ -36,7 +36,7 @@ import org.apache.log4j.Logger; */ @InterfaceAudience.Private public class RESTServlet implements Constants { - private static Logger LOG = Logger.getLogger(RESTServlet.class); + private static final Logger LOG = Logger.getLogger(RESTServlet.class); private static RESTServlet INSTANCE; private final Configuration conf; private final MetricsREST metrics = new MetricsREST(); diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java index ef53f46d990..7ad162431a5 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java @@ -32,7 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; public class DummyFilter implements Filter { - private Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(DummyFilter.class); @Override public void destroy() { diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java index 8a399e97a87..628b17cc47c 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java @@ -33,7 +33,7 @@ import com.sun.jersey.spi.container.servlet.ServletContainer; public class HBaseRESTTestingUtility { - static final Log LOG = LogFactory.getLog(HBaseRESTTestingUtility.class); + private static final Log LOG = LogFactory.getLog(HBaseRESTTestingUtility.class); private int testServletPort; private Server server; diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java index 5fdc631a183..75ab0fcaaba 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java @@ -47,7 +47,7 @@ import org.junit.experimental.categories.Category; @Category({RestTests.class, MediumTests.class}) public class TestStatusResource { - public static Log LOG = LogFactory.getLog(TestStatusResource.class); + private static final Log LOG = LogFactory.getLog(TestStatusResource.class); private static final byte[] META_REGION_NAME = Bytes.toBytes(TableName.META_TABLE_NAME + ",,1"); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java index e729ec862d4..ff9f94b632c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java @@ -29,7 +29,7 @@ import org.apache.hadoop.util.StringUtils; * The Class HealthCheckChore for running health checker regularly. */ public class HealthCheckChore extends ScheduledChore { - private static Log LOG = LogFactory.getLog(HealthCheckChore.class); + private static final Log LOG = LogFactory.getLog(HealthCheckChore.class); private HealthChecker healthChecker; private Configuration config; private int threshold; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java index 687d171f57d..49cc9138f7f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java @@ -35,7 +35,7 @@ import org.apache.hadoop.util.Shell.ShellCommandExecutor; */ class HealthChecker { - private static Log LOG = LogFactory.getLog(HealthChecker.class); + private static final Log LOG = LogFactory.getLog(HealthChecker.class); private ShellCommandExecutor shexec = null; private String exceptionStackTrace; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java index 6d22142a871..0d1c7c41849 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java @@ -48,7 +48,7 @@ import javax.rmi.ssl.SslRMIServerSocketFactory; */ public class JMXListener implements Coprocessor { - public static final Log LOG = LogFactory.getLog(JMXListener.class); + private static final Log LOG = LogFactory.getLog(JMXListener.class); public static final String RMI_REGISTRY_PORT_CONF_KEY = ".rmi.registry.port"; public static final String RMI_CONNECTOR_PORT_CONF_KEY = ".rmi.connector.port"; public static final int defMasterRMIRegistryPort = 10101; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java index 1263318e789..c86536087fb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java @@ -60,7 +60,7 @@ import org.apache.hadoop.hbase.util.JVMClusterUtil; @InterfaceAudience.Public @InterfaceStability.Evolving public class LocalHBaseCluster { - static final Log LOG = LogFactory.getLog(LocalHBaseCluster.class); + private static final Log LOG = LogFactory.getLog(LocalHBaseCluster.class); private final List masterThreads = new CopyOnWriteArrayList(); private final List regionThreads = diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ZKNamespaceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ZKNamespaceManager.java index d7edf401656..7f5faa60056 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ZKNamespaceManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ZKNamespaceManager.java @@ -48,7 +48,7 @@ import java.util.concurrent.ConcurrentSkipListMap; */ @InterfaceAudience.Private public class ZKNamespaceManager extends ZooKeeperListener { - private static Log LOG = LogFactory.getLog(ZKNamespaceManager.class); + private static final Log LOG = LogFactory.getLog(ZKNamespaceManager.class); private final String nsZNode; private volatile NavigableMap cache; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java index ce32aabe469..a8b966a6e63 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java @@ -45,7 +45,7 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; * check its content to make sure that the backup server is not now in charge.

*/ public class ZNodeClearer { - public static final Log LOG = LogFactory.getLog(ZNodeClearer.class); + private static final Log LOG = LogFactory.getLog(ZNodeClearer.class); private ZNodeClearer() {} diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationManager.java index 76edbf47f9e..29b3e8b12b6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationManager.java @@ -73,7 +73,7 @@ import java.util.WeakHashMap; @InterfaceAudience.Private @InterfaceStability.Evolving public class ConfigurationManager { - public static final Log LOG = LogFactory.getLog(ConfigurationManager.class); + private static final Log LOG = LogFactory.getLog(ConfigurationManager.class); // The set of Configuration Observers. These classes would like to get // notified when the configuration is reloaded from disk. This is a set diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java index a6f92191932..f5fc9793b00 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java @@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public class ForeignExceptionDispatcher implements ForeignExceptionListener, ForeignExceptionSnare { - public static final Log LOG = LogFactory.getLog(ForeignExceptionDispatcher.class); + private static final Log LOG = LogFactory.getLog(ForeignExceptionDispatcher.class); protected final String name; protected final List listeners = new ArrayList(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java index def36a0898d..422db44c905 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java @@ -33,7 +33,7 @@ import org.mortbay.jetty.RequestLog; */ public class HttpRequestLog { - public static final Log LOG = LogFactory.getLog(HttpRequestLog.class); + private static final Log LOG = LogFactory.getLog(HttpRequestLog.class); private static final HashMap serverToComponent; static { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java index 1ffd515de2f..e2688b18707 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java @@ -101,7 +101,7 @@ import com.sun.jersey.spi.container.servlet.ServletContainer; @InterfaceAudience.Private @InterfaceStability.Evolving public class HttpServer implements FilterContainer { - public static final Log LOG = LogFactory.getLog(HttpServer.class); + private static final Log LOG = LogFactory.getLog(HttpServer.class); static final String FILTER_INITIALIZERS_PROPERTY = "hbase.http.filter.initializers"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java index 58502bb6323..ce8ff3877f8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java @@ -51,7 +51,7 @@ import org.apache.hadoop.hbase.util.Bytes; */ @InterfaceAudience.Private public class HalfStoreFileReader extends StoreFile.Reader { - final Log LOG = LogFactory.getLog(HalfStoreFileReader.class); + private static final Log LOG = LogFactory.getLog(HalfStoreFileReader.class); final boolean top; // This is the key we split around. Its the first possible entry on a row: // i.e. empty column and a timestamp of LATEST_TIMESTAMP. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java index 0b84ab2590f..03d9d430b6f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java @@ -135,6 +135,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private public class HFile { + // LOG is being used in HFileBlock and CheckSumUtil static final Log LOG = LogFactory.getLog(HFile.class); /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java index bf46bcf28f6..18dcbb0d974 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java @@ -97,7 +97,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; @JsonIgnoreProperties({"encodingCountsForTest"}) public class LruBlockCache implements ResizableBlockCache, HeapSize { - static final Log LOG = LogFactory.getLog(LruBlockCache.class); + private static final Log LOG = LogFactory.getLog(LruBlockCache.class); /** * Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java index 902e9480ff3..4e3929dd20f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java @@ -49,7 +49,7 @@ import com.google.common.primitives.Ints; @InterfaceAudience.Private @JsonIgnoreProperties({"indexStatistics", "freeSize", "usedSize"}) public final class BucketAllocator { - static final Log LOG = LogFactory.getLog(BucketAllocator.class); + private static final Log LOG = LogFactory.getLog(BucketAllocator.class); @JsonIgnoreProperties({"completelyFree", "uninstantiated"}) public final static class Bucket { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java index 6a5c884e69b..dfada87421b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java @@ -92,7 +92,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; */ @InterfaceAudience.Private public class BucketCache implements BlockCache, HeapSize { - static final Log LOG = LogFactory.getLog(BucketCache.class); + private static final Log LOG = LogFactory.getLog(BucketCache.class); /** Priority buckets */ private static final float DEFAULT_SINGLE_FACTOR = 0.25f; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java index e2274e9935b..fd4de3a7dd7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java @@ -18,6 +18,8 @@ package org.apache.hadoop.hbase.ipc; */ import java.nio.channels.ClosedChannelException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.ipc.RpcServer.Call; @@ -38,6 +40,8 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class CallRunner { + private static final Log LOG = LogFactory.getLog(CallRunner.class); + private Call call; private RpcServerInterface rpcServer; private MonitoredRPCHandler status; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java index 1274f0235f8..35577689e25 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java @@ -157,6 +157,7 @@ import com.google.protobuf.TextFormat; @InterfaceAudience.LimitedPrivate({HBaseInterfaceAudience.COPROC, HBaseInterfaceAudience.PHOENIX}) @InterfaceStability.Evolving public class RpcServer implements RpcServerInterface { + // LOG is being used in CallRunner and the log level is being changed in tests public static final Log LOG = LogFactory.getLog(RpcServer.class); private static final CallQueueTooBigException CALL_QUEUE_TOO_BIG_EXCEPTION = new CallQueueTooBigException(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java index d8ae3ba11c5..2889d8d9b88 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.util.BoundedPriorityBlockingQueue; @InterfaceAudience.LimitedPrivate({HBaseInterfaceAudience.COPROC, HBaseInterfaceAudience.PHOENIX}) @InterfaceStability.Evolving public class SimpleRpcScheduler extends RpcScheduler { - public static final Log LOG = LogFactory.getLog(SimpleRpcScheduler.class); + private static final Log LOG = LogFactory.getLog(SimpleRpcScheduler.class); public static final String CALL_QUEUE_READ_SHARE_CONF_KEY = "hbase.ipc.server.callqueue.read.ratio"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java index c577c54889a..a3daf7a782f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java @@ -44,7 +44,7 @@ import static org.apache.hadoop.hbase.mapreduce.TableRecordReaderImpl.LOG_PER_RO @InterfaceAudience.Public @InterfaceStability.Stable public class TableRecordReaderImpl { - static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class); + private static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class); private byte [] startRow; private byte [] endRow; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java index 6d6feb1f8d7..ceb77685d63 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java @@ -57,7 +57,7 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceAudience.Public @InterfaceStability.Stable public class HFileOutputFormat extends FileOutputFormat { - static Log LOG = LogFactory.getLog(HFileOutputFormat.class); + private static final Log LOG = LogFactory.getLog(HFileOutputFormat.class); // This constant is public since the client can modify this when setting // up their conf object and thus refer to this symbol. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java index 26ae0970e2c..1dded22f528 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java @@ -86,7 +86,7 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceStability.Evolving public class HFileOutputFormat2 extends FileOutputFormat { - static Log LOG = LogFactory.getLog(HFileOutputFormat2.class); + private static final Log LOG = LogFactory.getLog(HFileOutputFormat2.class); // The following constants are private since these are used by // HFileOutputFormat2 to internally transfer data between job setup and diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java index 890cfdd78a3..f4a3eb11b03 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java @@ -59,7 +59,7 @@ import java.util.Iterator; public abstract class MultiTableInputFormatBase extends InputFormat { - final Log LOG = LogFactory.getLog(MultiTableInputFormatBase.class); + private static final Log LOG = LogFactory.getLog(MultiTableInputFormatBase.class); /** Holds the set of scans used to define the input. */ private List scans; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java index def460f3524..987b3773451 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java @@ -113,7 +113,7 @@ extends InputFormat { * default is true. False means the table is using binary row key*/ public static final String TABLE_ROW_TEXTKEY = "hbase.table.row.textkey"; - final Log LOG = LogFactory.getLog(TableInputFormatBase.class); + private static final Log LOG = LogFactory.getLog(TableInputFormatBase.class); private static final String NOT_INITIALIZED = "The input format instance has not been properly " + "initialized. Ensure you call initializeTable either in your constructor or initialize " + diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index 149752b68e1..c3466f3c1a4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -70,7 +70,7 @@ import com.yammer.metrics.core.MetricsRegistry; @InterfaceAudience.Public @InterfaceStability.Stable public class TableMapReduceUtil { - static Log LOG = LogFactory.getLog(TableMapReduceUtil.class); + private static final Log LOG = LogFactory.getLog(TableMapReduceUtil.class); /** * Use this before submitting a TableMap job. It will appropriately set up diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java index 06fa7125fa3..f859780be07 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java @@ -49,7 +49,7 @@ public class TableRecordReaderImpl { public static final String LOG_PER_ROW_COUNT = "hbase.mapreduce.log.scanner.rowcount"; - static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class); + private static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class); // HBASE_COUNTER_GROUP_NAME is the name of mapreduce counter group for HBase private static final String HBASE_COUNTER_GROUP_NAME = diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java index 090b1a2d1b0..7111668f2ed 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java @@ -43,6 +43,8 @@ import org.apache.hadoop.mapreduce.InputSplit; @InterfaceStability.Evolving public class TableSplit extends InputSplit implements Writable, Comparable { + /** @deprecated LOG variable would be made private. */ + @Deprecated public static final Log LOG = LogFactory.getLog(TableSplit.class); // should be < 0 (@see #readFields(DataInput)) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java index c20e375a8a0..fabd2030814 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java @@ -68,7 +68,7 @@ import java.util.TreeMap; @InterfaceAudience.Public @InterfaceStability.Stable public class WALPlayer extends Configured implements Tool { - final static Log LOG = LogFactory.getLog(WALPlayer.class); + private static final Log LOG = LogFactory.getLog(WALPlayer.class); final static String NAME = "WALPlayer"; final static String BULK_OUTPUT_CONF_KEY = "wal.bulk.output"; final static String TABLES_KEY = "wal.input.tables"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java index 9994dbca952..53de19dabb6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.master.balancer.FavoredNodesPlan; */ @InterfaceAudience.Private public class AssignmentVerificationReport { - protected static final Log LOG = LogFactory.getLog( + private static final Log LOG = LogFactory.getLog( AssignmentVerificationReport.class.getName()); private TableName tableName = null; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index 589c169cd08..d9c0407107a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -181,7 +181,7 @@ import com.google.protobuf.ServiceException; @SuppressWarnings("deprecation") public class MasterRpcServices extends RSRpcServices implements MasterService.BlockingInterface, RegionServerStatusService.BlockingInterface { - protected static final Log LOG = LogFactory.getLog(MasterRpcServices.class.getName()); + private static final Log LOG = LogFactory.getLog(MasterRpcServices.class.getName()); private final HMaster master; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java index 9731b4ed101..b6d3b27f40f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.master.MetricsMasterWrapper; @InterfaceStability.Evolving @InterfaceAudience.Private public class MetricsMaster { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(MetricsMaster.class); private MetricsMasterSource masterSource; public MetricsMaster(MetricsMasterWrapper masterWrapper) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RackManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RackManager.java index 498b95cba1d..ea4612a6f83 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RackManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RackManager.java @@ -36,7 +36,7 @@ import org.apache.hadoop.net.ScriptBasedMapping; */ @InterfaceAudience.Private public class RackManager { - static final Log LOG = LogFactory.getLog(RackManager.class); + private static final Log LOG = LogFactory.getLog(RackManager.class); public static final String UNKNOWN_RACK = "Unknown Rack"; private DNSToSwitchMapping switchMapping; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.java index ca1ef72819b..17be833988f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.ServerName; */ @InterfaceAudience.Private public class FavoredNodesPlan { - protected static final Log LOG = LogFactory.getLog( + private static final Log LOG = LogFactory.getLog( FavoredNodesPlan.class.getName()); /** the map between each region and its favored region server list */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java index 3da4110c54d..f201417dcb1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java @@ -51,7 +51,7 @@ import com.google.common.cache.LoadingCache; */ class RegionLocationFinder { - private static Log LOG = LogFactory.getLog(RegionLocationFinder.class); + private static final Log LOG = LogFactory.getLog(RegionLocationFinder.class); private Configuration conf; private ClusterStatus status; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java index f68bfa22db3..1cc8d48a761 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java @@ -35,7 +35,7 @@ import org.apache.hadoop.hbase.wal.DefaultWALProvider; */ @InterfaceAudience.Private public class LogCleaner extends CleanerChore { - static final Log LOG = LogFactory.getLog(LogCleaner.class.getName()); + private static final Log LOG = LogFactory.getLog(LogCleaner.class.getName()); /** * @param p the period of time to sleep between each run diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java index c4ca9d3986e..e821b2e233e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java @@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class TimeToLiveHFileCleaner extends BaseHFileCleanerDelegate { - public static final Log LOG = LogFactory.getLog(TimeToLiveHFileCleaner.class.getName()); + private static final Log LOG = LogFactory.getLog(TimeToLiveHFileCleaner.class.getName()); public static final String TTL_CONF_KEY = "hbase.master.hfilecleaner.ttl"; // default ttl = 5 minutes public static final long DEFAULT_TTL = 60000 * 5; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java index 9d68601fb13..e46d6e16e21 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java @@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; */ @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class TimeToLiveLogCleaner extends BaseLogCleanerDelegate { - static final Log LOG = LogFactory.getLog(TimeToLiveLogCleaner.class.getName()); + private static final Log LOG = LogFactory.getLog(TimeToLiveLogCleaner.class.getName()); // Configured time a log can be kept after it was closed private long ttl; private boolean stopped = false; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java index 0afafe46d94..6d6f143cbae 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java @@ -40,7 +40,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Public public class NamespaceAuditor { - private static Log LOG = LogFactory.getLog(NamespaceAuditor.class); + private static final Log LOG = LogFactory.getLog(NamespaceAuditor.class); static final String NS_AUDITOR_INIT_TIMEOUT = "hbase.namespace.auditor.init.timeout"; static final int DEFAULT_NS_AUDITOR_INIT_TIMEOUT = 120000; private NamespaceStateManager stateManager; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java index ea1e21a8db0..2280e36a48c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.util.Bytes; @InterfaceAudience.Private class NamespaceStateManager { - private static Log LOG = LogFactory.getLog(NamespaceStateManager.class); + private static final Log LOG = LogFactory.getLog(NamespaceStateManager.class); private ConcurrentMap nsStateCache; private MasterServices master; private volatile boolean initialized = false; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java index 1a8510199d8..3e32ca2c6ac 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java @@ -38,7 +38,7 @@ import com.google.protobuf.InvalidProtocolBufferException; */ @InterfaceAudience.Private public class ZKProcedureCoordinatorRpcs implements ProcedureCoordinatorRpcs { - public static final Log LOG = LogFactory.getLog(ZKProcedureCoordinatorRpcs.class); + private static final Log LOG = LogFactory.getLog(ZKProcedureCoordinatorRpcs.class); private ZKProcedureUtil zkProc = null; protected ProcedureCoordinator coordinator = null; // if started this should be non-null diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java index 29228db7c18..c66c0d54dae 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java @@ -69,7 +69,7 @@ import com.google.protobuf.TextFormat; //to figure out whether it is a meta region or not. @InterfaceAudience.Private class AnnotationReadingPriorityFunction implements PriorityFunction { - public static final Log LOG = + private static final Log LOG = LogFactory.getLog(AnnotationReadingPriorityFunction.class.getName()); /** Used to control the scan delay, currently sqrt(numNextCall * weight) */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java index 7f3878fa199..1c88eb03b9c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java @@ -56,7 +56,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private public class CompactSplitThread implements CompactionRequestor, PropagatingConfigurationObserver { - static final Log LOG = LogFactory.getLog(CompactSplitThread.class); + private static final Log LOG = LogFactory.getLog(CompactSplitThread.class); // Configuration key for the large compaction threads. public final static String LARGE_COMPACTION_THREADS = diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java index 8305b99fe85..22a79b4f34b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java @@ -43,7 +43,7 @@ import com.google.common.collect.Lists; */ @InterfaceAudience.Private class DefaultStoreFileManager implements StoreFileManager { - static final Log LOG = LogFactory.getLog(DefaultStoreFileManager.class); + private static final Log LOG = LogFactory.getLog(DefaultStoreFileManager.class); private final KVComparator kvComparator; private final CompactionConfiguration comConf; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 58051491610..d8b88f0a737 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -195,7 +195,7 @@ import com.google.protobuf.TextFormat; @InterfaceAudience.Private public class HRegion implements HeapSize, PropagatingConfigurationObserver, Region { - public static final Log LOG = LogFactory.getLog(HRegion.class); + private static final Log LOG = LogFactory.getLog(HRegion.class); public static final String LOAD_CFS_ON_DEMAND_CONFIG_KEY = "hbase.hregion.scan.loadColumnFamiliesOnDemand"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java index 014ec2c0dae..1a95bdabfe8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java @@ -59,7 +59,7 @@ import org.apache.hadoop.hbase.util.ServerRegionReplicaUtil; */ @InterfaceAudience.Private public class HRegionFileSystem { - public static final Log LOG = LogFactory.getLog(HRegionFileSystem.class); + private static final Log LOG = LogFactory.getLog(HRegionFileSystem.class); /** Name of the region info file that resides just under the region directory. */ public final static String REGION_INFO_FILE = ".regioninfo"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 2e22e33a94f..dca3415ae57 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -193,7 +193,7 @@ import com.google.protobuf.ServiceException; public class HRegionServer extends HasThread implements RegionServerServices, LastSequenceId { - public static final Log LOG = LogFactory.getLog(HRegionServer.class); + private static final Log LOG = LogFactory.getLog(HRegionServer.class); /** * For testing only! Set to true to skip notifying region assignment to master . diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index 3cebaf6295a..47973cdd419 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -133,7 +133,7 @@ public class HStore implements Store { public static final int DEFAULT_COMPACTCHECKER_INTERVAL_MULTIPLIER = 1000; public static final int DEFAULT_BLOCKING_STOREFILE_COUNT = 7; - static final Log LOG = LogFactory.getLog(HStore.class); + private static final Log LOG = LogFactory.getLog(HStore.class); protected final MemStore memstore; // This stores directory in the filesystem. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.java index d7a9be56771..476bcdb2cb4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.HTableDescriptor; @InterfaceAudience.Private public class IncreasingToUpperBoundRegionSplitPolicy extends ConstantSizeRegionSplitPolicy { - static final Log LOG = + private static final Log LOG = LogFactory.getLog(IncreasingToUpperBoundRegionSplitPolicy.class); private long initialSize; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java index de8ed8d7b5b..7649ac9139c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java @@ -50,7 +50,7 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceAudience.Private @VisibleForTesting public class LogRoller extends HasThread { - static final Log LOG = LogFactory.getLog(LogRoller.class); + private static final Log LOG = LogFactory.getLog(LogRoller.class); private final ReentrantLock rollLock = new ReentrantLock(); private final AtomicBoolean rollLog = new AtomicBoolean(false); private final ConcurrentHashMap walNeedsRoll = diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LruHashMap.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LruHashMap.java index accd7a31037..18f519866e0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LruHashMap.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LruHashMap.java @@ -52,7 +52,7 @@ import java.util.Set; public class LruHashMap implements HeapSize, Map { - static final Log LOG = LogFactory.getLog(LruHashMap.class); + private static final Log LOG = LogFactory.getLog(LruHashMap.class); /** The default size (in bytes) of the LRU */ private static final long DEFAULT_MAX_MEM_USAGE = 50000; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java index 485d30f90bd..644e89b0d0f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java @@ -73,7 +73,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private class MemStoreFlusher implements FlushRequester { - static final Log LOG = LogFactory.getLog(MemStoreFlusher.class); + private static final Log LOG = LogFactory.getLog(MemStoreFlusher.class); private Configuration conf; // These two data members go together. Any entry in the one must have diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java index 8f7dee425a8..9c151028883 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java @@ -49,7 +49,7 @@ import org.apache.hadoop.metrics2.MetricsExecutor; class MetricsRegionServerWrapperImpl implements MetricsRegionServerWrapper { - public static final Log LOG = LogFactory.getLog(MetricsRegionServerWrapperImpl.class); + private static final Log LOG = LogFactory.getLog(MetricsRegionServerWrapperImpl.class); private final HRegionServer regionServer; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java index 534d01df36f..bc2867e8cd4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java @@ -35,7 +35,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private class RegionMergeRequest implements Runnable { - static final Log LOG = LogFactory.getLog(RegionMergeRequest.class); + private static final Log LOG = LogFactory.getLog(RegionMergeRequest.class); private final HRegion region_a; private final HRegion region_b; private final HRegionServer server; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java index 7c8ff7d0a42..8dfd0f42289 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java @@ -50,7 +50,7 @@ import org.apache.hadoop.hbase.classification.InterfaceStability; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public class ScannerContext { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ScannerContext.class); /** * Two sets of the same fields. One for the limits, another for the progress towards those limits @@ -626,4 +626,4 @@ public class ScannerContext { return sb.toString(); } } -} \ No newline at end of file +} diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java index b1600c03130..ea47e2dd133 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java @@ -36,7 +36,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private class SplitRequest implements Runnable { - static final Log LOG = LogFactory.getLog(SplitRequest.class); + private static final Log LOG = LogFactory.getLog(SplitRequest.class); private final HRegion parent; private final byte[] midKey; private final HRegionServer server; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java index 8cb20cd4fb5..cafd203fa28 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java @@ -79,7 +79,7 @@ import com.google.common.collect.Ordering; */ @InterfaceAudience.LimitedPrivate("Coprocessor") public class StoreFile { - static final Log LOG = LogFactory.getLog(StoreFile.class.getName()); + private static final Log LOG = LogFactory.getLog(StoreFile.class.getName()); // Keys for fileinfo values in HFile @@ -1028,7 +1028,7 @@ public class StoreFile { * Reader for a StoreFile. */ public static class Reader { - static final Log LOG = LogFactory.getLog(Reader.class.getName()); + private static final Log LOG = LogFactory.getLog(Reader.class.getName()); protected BloomFilter generalBloomFilter = null; protected BloomFilter deleteFamilyBloomFilter = null; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java index 093952934c7..6516a3e3199 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.util.FSUtils; */ @InterfaceAudience.Private public class StoreFileInfo { - public static final Log LOG = LogFactory.getLog(StoreFileInfo.class); + private static final Log LOG = LogFactory.getLog(StoreFileInfo.class); /** * A non-capture group, for hfiles, so that this can be embedded. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java index 22fd46e9779..b469a8b0966 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.regionserver.StoreFile.Reader; */ @InterfaceAudience.LimitedPrivate("Coprocessor") public class StoreFileScanner implements KeyValueScanner { - static final Log LOG = LogFactory.getLog(HStore.class); + private static final Log LOG = LogFactory.getLog(HStore.class); // the reader it comes from: private final StoreFile.Reader reader; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java index f7e06ef7a43..54164a02341 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java @@ -56,7 +56,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @InterfaceAudience.Private public class StoreScanner extends NonReversedNonLazyKeyValueScanner implements KeyValueScanner, InternalScanner, ChangedReadersObserver { - static final Log LOG = LogFactory.getLog(StoreScanner.class); + private static final Log LOG = LogFactory.getLog(StoreScanner.class); protected Store store; protected ScanQueryMatcher matcher; protected KeyValueHeap heap; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java index bf07418c7e1..1725406315d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java @@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration; */ @InterfaceAudience.Private public class StripeStoreConfig { - static final Log LOG = LogFactory.getLog(StripeStoreConfig.class); + private static final Log LOG = LogFactory.getLog(StripeStoreConfig.class); /** The maximum number of files to compact within a stripe; same as for regular compaction. */ public static final String MAX_FILES_KEY = "hbase.store.stripe.compaction.maxFiles"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreEngine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreEngine.java index b91052765b8..454262b3a2b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreEngine.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreEngine.java @@ -42,7 +42,7 @@ import com.google.common.base.Preconditions; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class StripeStoreEngine extends StoreEngine { - static final Log LOG = LogFactory.getLog(StripeStoreEngine.class); + private static final Log LOG = LogFactory.getLog(StripeStoreEngine.class); private StripeStoreConfig config; @Override diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java index dff6765e9a4..1bbaefe229e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java @@ -64,7 +64,7 @@ import com.google.common.collect.ImmutableList; @InterfaceAudience.Private public class StripeStoreFileManager implements StoreFileManager, StripeCompactionPolicy.StripeInformationProvider { - static final Log LOG = LogFactory.getLog(StripeStoreFileManager.class); + private static final Log LOG = LogFactory.getLog(StripeStoreFileManager.class); /** * The file metadata fields that contain the stripe information. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.java index 0de154c7022..048d1284099 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.regionserver.StoreConfigInformation; @InterfaceAudience.Private public class CompactionConfiguration { - static final Log LOG = LogFactory.getLog(CompactionConfiguration.class); + private static final Log LOG = LogFactory.getLog(CompactionConfiguration.class); public static final String HBASE_HSTORE_COMPACTION_RATIO_KEY = "hbase.hstore.compaction.ratio"; public static final String HBASE_HSTORE_COMPACTION_RATIO_OFFPEAK_KEY = diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java index 4e7106de253..5d442243899 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java @@ -43,7 +43,7 @@ import com.google.common.collect.Collections2; @InterfaceAudience.LimitedPrivate({ "coprocessor" }) @InterfaceStability.Evolving public class CompactionRequest implements Comparable { - static final Log LOG = LogFactory.getLog(CompactionRequest.class); + private static final Log LOG = LogFactory.getLog(CompactionRequest.class); // was this compaction promoted to an off-peak private boolean isOffPeak = false; private enum DisplayCompactionType { MINOR, ALL_FILES, MAJOR } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java index 60e36f1e972..9408f997b11 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java @@ -152,7 +152,7 @@ public class FSHLog implements WAL { // synchronization class used to halt the consumer at a safe point -- just after all outstanding // syncs and appends have completed -- so the log roller can swap the WAL out under it. - static final Log LOG = LogFactory.getLog(FSHLog.class); + private static final Log LOG = LogFactory.getLog(FSHLog.class); private static final int DEFAULT_SLOW_SYNC_TIME_MS = 100; // in ms diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java index 9fd2a376d10..8caf8dfb59b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java @@ -53,7 +53,7 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.REPLICATION) @Deprecated public class HLogKey extends WALKey implements Writable { - public static final Log LOG = LogFactory.getLog(HLogKey.class); + private static final Log LOG = LogFactory.getLog(HLogKey.class); public HLogKey() { super(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java index 4d465e44d17..24fd9405571 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java @@ -32,7 +32,7 @@ import org.apache.hadoop.util.StringUtils; */ @InterfaceAudience.Private public class MetricsWAL extends WALActionsListener.Base { - static final Log LOG = LogFactory.getLog(MetricsWAL.class); + private static final Log LOG = LogFactory.getLog(MetricsWAL.class); private final MetricsWALSource source; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java index 8a4f27cbf25..b6b1d080930 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.CompatibilitySingletonFactory; */ @InterfaceAudience.Private public class MetricsWALEditsReplay { - static final Log LOG = LogFactory.getLog(MetricsWALEditsReplay.class); + private static final Log LOG = LogFactory.getLog(MetricsWALEditsReplay.class); private final MetricsEditsReplaySource source; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java index ca80e4c32b8..cc457bb115d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java @@ -44,7 +44,7 @@ import static org.apache.hadoop.hbase.regionserver.wal.ProtobufLogReader.DEFAULT */ @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class ProtobufLogWriter extends WriterBase { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ProtobufLogWriter.class); protected FSDataOutputStream output; protected Codec.Encoder cellEncoder; protected WALCellCodec.ByteStringCompressor compressor; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEdit.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEdit.java index 5d0573fdbd4..c3e0e7e5c0d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEdit.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEdit.java @@ -83,7 +83,7 @@ import org.apache.hadoop.io.Writable; @InterfaceAudience.LimitedPrivate({ HBaseInterfaceAudience.REPLICATION, HBaseInterfaceAudience.COPROC }) public class WALEdit implements Writable, HeapSize { - public static final Log LOG = LogFactory.getLog(WALEdit.class); + private static final Log LOG = LogFactory.getLog(WALEdit.class); // TODO: Get rid of this; see HBASE-8457 public static final byte [] METAFAMILY = Bytes.toBytes("METAFAMILY"); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALUtil.java index 94ef072c895..399623fcac7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALUtil.java @@ -46,7 +46,7 @@ import com.google.protobuf.TextFormat; */ @InterfaceAudience.Private public class WALUtil { - static final Log LOG = LogFactory.getLog(WALUtil.class); + private static final Log LOG = LogFactory.getLog(WALUtil.class); /** * Write the marker that a compaction has succeeded and is about to be committed. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java index 04c3d2d4b8d..cf0878725d7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java @@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.REPLICATION) public class MetricsSource { - public static final Log LOG = LogFactory.getLog(MetricsSource.class); + private static final Log LOG = LogFactory.getLog(MetricsSource.class); private long lastTimestamp = 0; private int lastQueueSize = 0; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java index 794a3e155c6..4603fa8838d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java @@ -76,7 +76,7 @@ import com.google.common.util.concurrent.Service; public class ReplicationSource extends Thread implements ReplicationSourceInterface { - public static final Log LOG = LogFactory.getLog(ReplicationSource.class); + private static final Log LOG = LogFactory.getLog(ReplicationSource.class); // Queue of logs to process private PriorityBlockingQueue queue; private ReplicationQueues replicationQueues; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java index 4b997b4be29..8d38b09253f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java @@ -48,7 +48,7 @@ import org.apache.hadoop.util.ToolRunner; public class ReplicationSyncUp extends Configured implements Tool { - static final Log LOG = LogFactory.getLog(ReplicationSyncUp.class.getName()); + private static final Log LOG = LogFactory.getLog(ReplicationSyncUp.class.getName()); private static Configuration conf; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java index 3ee7a9a4027..b9e56d933a5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java @@ -46,7 +46,7 @@ import org.apache.hadoop.security.token.SecretManager.InvalidToken; */ @InterfaceAudience.Private public class HBaseSaslRpcServer { - public static final Log LOG = LogFactory.getLog(HBaseSaslRpcServer.class); + private static final Log LOG = LogFactory.getLog(HBaseSaslRpcServer.class); public static void init(Configuration conf) { SaslUtil.initSaslProperties(conf.get("hbase.rpc.protection", diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java index fafc5a5b0d6..7ff228415fc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java @@ -119,7 +119,7 @@ public class AccessControlLists { /** Configuration key for superusers */ public static final String SUPERUSER_CONF_KEY = "hbase.superuser"; - private static Log LOG = LogFactory.getLog(AccessControlLists.class); + private static final Log LOG = LogFactory.getLog(AccessControlLists.class); /** * Create the ACL table diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java index 51fee5caac7..4d2230960dd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java @@ -155,7 +155,7 @@ public class AccessController extends BaseMasterAndRegionObserver implements RegionServerObserver, AccessControlService.Interface, CoprocessorService, EndpointObserver, BulkLoadObserver { - public static final Log LOG = LogFactory.getLog(AccessController.class); + private static final Log LOG = LogFactory.getLog(AccessController.class); private static final Log AUDITLOG = LogFactory.getLog("SecurityLogger."+AccessController.class.getName()); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java index bae665eb28e..520df4a7640 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java @@ -124,7 +124,7 @@ import com.google.protobuf.RpcController; @Deprecated @InterfaceAudience.Private class HbaseObjectWritableFor96Migration implements Writable, WritableWithSize, Configurable { - protected final static Log LOG = LogFactory.getLog(HbaseObjectWritableFor96Migration.class); + private final static Log LOG = LogFactory.getLog(HbaseObjectWritableFor96Migration.class); // Here we maintain two static maps of classes to code and vice versa. // Add new classes+codes as wanted or figure way to auto-generate these diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java index 6abc3584972..becc9f3cca3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java @@ -110,7 +110,7 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService private static final int RANDOM_WIDTH = 320; private static final int RANDOM_RADIX = 32; - private static Log LOG = LogFactory.getLog(SecureBulkLoadEndpoint.class); + private static final Log LOG = LogFactory.getLog(SecureBulkLoadEndpoint.class); private final static FsPermission PERM_ALL_ACCESS = FsPermission.valueOf("-rwxrwxrwx"); private final static FsPermission PERM_HIDDEN = FsPermission.valueOf("-rwx--x--x"); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java index d043735d429..a6ac4ae8f8a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java @@ -91,7 +91,7 @@ public class TableAuthManager { } } - private static Log LOG = LogFactory.getLog(TableAuthManager.class); + private static final Log LOG = LogFactory.getLog(TableAuthManager.class); private static TableAuthManager instance; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java index 2c051ea7ea7..d5fdd4147e0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java @@ -44,7 +44,7 @@ import java.util.concurrent.CountDownLatch; */ @InterfaceAudience.Private public class ZKPermissionWatcher extends ZooKeeperListener { - private static Log LOG = LogFactory.getLog(ZKPermissionWatcher.class); + private static final Log LOG = LogFactory.getLog(ZKPermissionWatcher.class); // parent node for permissions lists static final String ACL_NODE = "acl"; TableAuthManager authManager; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java index 147353767bb..524b6f983fe 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java @@ -60,7 +60,7 @@ public class AuthenticationTokenSecretManager static final String NAME_PREFIX = "SecretManager-"; - private static Log LOG = LogFactory.getLog( + private static final Log LOG = LogFactory.getLog( AuthenticationTokenSecretManager.class); private long lastKeyUpdate; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java index 6548194214e..a7e6113649a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java @@ -50,7 +50,7 @@ import org.apache.hadoop.security.token.Token; public class TokenProvider implements AuthenticationProtos.AuthenticationService.Interface, Coprocessor, CoprocessorService { - private static Log LOG = LogFactory.getLog(TokenProvider.class); + private static final Log LOG = LogFactory.getLog(TokenProvider.class); private AuthenticationTokenSecretManager secretManager; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/ZKSecretWatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/ZKSecretWatcher.java index 5fb3d40a586..2264193bf2d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/ZKSecretWatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/ZKSecretWatcher.java @@ -38,7 +38,7 @@ import org.apache.zookeeper.KeeperException; public class ZKSecretWatcher extends ZooKeeperListener { private static final String DEFAULT_ROOT_NODE = "tokenauth"; private static final String DEFAULT_KEYS_PARENT = "keys"; - private static Log LOG = LogFactory.getLog(ZKSecretWatcher.class); + private static final Log LOG = LogFactory.getLog(ZKSecretWatcher.class); private AuthenticationTokenSecretManager secretManager; private String baseKeyZNode; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java index d1f787a3630..d1e02364474 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java @@ -50,7 +50,7 @@ import org.apache.hadoop.hbase.util.FSVisitor; */ @InterfaceAudience.Private public final class SnapshotReferenceUtil { - public static final Log LOG = LogFactory.getLog(SnapshotReferenceUtil.class); + private static final Log LOG = LogFactory.getLog(SnapshotReferenceUtil.class); public interface StoreFileVisitor { void storeFile(final HRegionInfo regionInfo, final String familyName, diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java index 1cef5238646..eb82a2ac15f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java @@ -43,7 +43,7 @@ import org.apache.hadoop.io.Writable; public class CompoundBloomFilterWriter extends CompoundBloomFilterBase implements BloomFilterWriter, InlineBlockWriter { - protected static final Log LOG = + private static final Log LOG = LogFactory.getLog(CompoundBloomFilterWriter.class); /** The current chunk being written to */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompressionTest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompressionTest.java index a9cc1c65ed4..f4d2fcc1cad 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompressionTest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompressionTest.java @@ -50,7 +50,7 @@ import org.apache.hadoop.io.compress.Compressor; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) @InterfaceStability.Evolving public class CompressionTest { - static final Log LOG = LogFactory.getLog(CompressionTest.class); + private static final Log LOG = LogFactory.getLog(CompressionTest.class); public static boolean testCompression(String codec) { codec = codec.toLowerCase(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java index 112a195c3b6..1eeeee0c47a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java @@ -47,7 +47,7 @@ import org.apache.log4j.Logger; */ @InterfaceAudience.Private public class ConnectionCache { - private static Logger LOG = Logger.getLogger(ConnectionCache.class); + private static final Logger LOG = Logger.getLogger(ConnectionCache.class); private final Map connections = new ConcurrentHashMap(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/EncryptionTest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/EncryptionTest.java index 1cd6ead339a..f45ecffa80d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/EncryptionTest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/EncryptionTest.java @@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.security.EncryptionUtil; @InterfaceAudience.Public @InterfaceStability.Evolving public class EncryptionTest { - static final Log LOG = LogFactory.getLog(EncryptionTest.class); + private static final Log LOG = LogFactory.getLog(EncryptionTest.class); static final Map keyProviderResults = new ConcurrentHashMap(); static final Map cipherProviderResults = diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java index 3c63e8a53ea..4c742e32454 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java @@ -55,7 +55,7 @@ import java.util.Random; */ @InterfaceAudience.Private public class HBaseFsckRepair { - public static final Log LOG = LogFactory.getLog(HBaseFsckRepair.class); + private static final Log LOG = LogFactory.getLog(HBaseFsckRepair.class); /** * Fix multiple assignment by doing silent closes on each RS hosting the region diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java index 49814caa213..e29384b9a28 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java @@ -55,7 +55,7 @@ import org.apache.hadoop.ipc.RemoteException; @InterfaceAudience.Private class HMerge { // TODO: Where is this class used? How does it relate to Merge in same package? - static final Log LOG = LogFactory.getLog(HMerge.class); + private static final Log LOG = LogFactory.getLog(HMerge.class); static final Random rand = new Random(); /* diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java index 4f9658572e4..0a9243de382 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java @@ -55,7 +55,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class Merge extends Configured implements Tool { - static final Log LOG = LogFactory.getLog(Merge.class); + private static final Log LOG = LogFactory.getLog(Merge.class); private Path rootdir; private volatile MetaUtils utils; private TableName tableName; // Name of table diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitCalculator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitCalculator.java index f5cc21b91c3..b904b43f4b1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitCalculator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitCalculator.java @@ -53,7 +53,7 @@ import com.google.common.collect.TreeMultimap; */ @InterfaceAudience.Private public class RegionSplitCalculator { - final static Log LOG = LogFactory.getLog(RegionSplitCalculator.class); + private static final Log LOG = LogFactory.getLog(RegionSplitCalculator.class); private final Comparator rangeCmp; /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java index 977593d97ca..3a08750ffde 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java @@ -141,7 +141,7 @@ import com.google.common.collect.Sets; */ @InterfaceAudience.Private public class RegionSplitter { - static final Log LOG = LogFactory.getLog(RegionSplitter.class); + private static final Log LOG = LogFactory.getLog(RegionSplitter.class); /** * A generic interface for the RegionSplitter code to use for all it's @@ -1115,4 +1115,4 @@ public class RegionSplitter { + "," + rowToStr(lastRow()) + "]"; } } -} \ No newline at end of file +} diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java index 61c7a97b995..621c200b647 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java @@ -70,7 +70,7 @@ import org.apache.hadoop.hbase.regionserver.wal.WALCellCodec; // purposes. They need to be merged into WALEntry. @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.REPLICATION) public class WALKey implements SequenceId, Comparable { - public static final Log LOG = LogFactory.getLog(WALKey.class); + private static final Log LOG = LogFactory.getLog(WALKey.class); // should be < 0 (@see HLogKey#readFields(DataInput)) // version 2 supports WAL compression diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java index 517b67eb50b..2c68a6895a1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java @@ -132,7 +132,7 @@ import com.google.protobuf.ServiceException; */ @InterfaceAudience.Private public class WALSplitter { - static final Log LOG = LogFactory.getLog(WALSplitter.class); + private static final Log LOG = LogFactory.getLog(WALSplitter.class); /** By default we retry errors in splitting, rather than skipping. */ public static final boolean SPLIT_SKIP_ERRORS_DEFAULT = false; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java index adbdd69fed1..e6f181be75b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java @@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.util.Threads; */ @InterfaceAudience.Private public abstract class HBaseCluster implements Closeable, Configurable { + // Log is being used in DistributedHBaseCluster class, hence keeping it as package scope static final Log LOG = LogFactory.getLog(HBaseCluster.class.getName()); protected Configuration conf; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java index cb12bea1e2d..dde6f4bdbe1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java @@ -60,7 +60,7 @@ public class HFilePerformanceEvaluation { "WARN"); } - static final Log LOG = + private static final Log LOG = LogFactory.getLog(HFilePerformanceEvaluation.class.getName()); static byte [] format(final int i) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MapFilePerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MapFilePerformanceEvaluation.java index fd829276a29..18b25c28f39 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MapFilePerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MapFilePerformanceEvaluation.java @@ -45,7 +45,7 @@ public class MapFilePerformanceEvaluation { private static final int ROW_LENGTH = 10; private static final int ROW_COUNT = 100000; - static final Log LOG = + private static final Log LOG = LogFactory.getLog(MapFilePerformanceEvaluation.class.getName()); /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java index 4a02b043ae4..38d92d33977 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java @@ -53,7 +53,7 @@ import org.apache.hadoop.hbase.util.Threads; @InterfaceAudience.Public @InterfaceStability.Evolving public class MiniHBaseCluster extends HBaseCluster { - static final Log LOG = LogFactory.getLog(MiniHBaseCluster.class.getName()); + private static final Log LOG = LogFactory.getLog(MiniHBaseCluster.class.getName()); public LocalHBaseCluster hbaseCluster; private static int index; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MultithreadedTestUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MultithreadedTestUtil.java index f333a5154ca..cea10ebde0e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MultithreadedTestUtil.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MultithreadedTestUtil.java @@ -30,7 +30,7 @@ import org.apache.hadoop.conf.Configuration; public abstract class MultithreadedTestUtil { - public static final Log LOG = + private static final Log LOG = LogFactory.getLog(MultithreadedTestUtil.class); public static class TestContext { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java index eb2f46885b1..569ef719a5e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java @@ -116,7 +116,7 @@ import com.yammer.metrics.stats.UniformSample; */ @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class PerformanceEvaluation extends Configured implements Tool { - protected static final Log LOG = LogFactory.getLog(PerformanceEvaluation.class.getName()); + private static final Log LOG = LogFactory.getLog(PerformanceEvaluation.class.getName()); private static final ObjectMapper MAPPER = new ObjectMapper(); static { MAPPER.configure(SORT_PROPERTIES_ALPHABETICALLY, true); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluationCommons.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluationCommons.java index 4b0aa583f68..3270c1c5aa1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluationCommons.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluationCommons.java @@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory; * Code shared by PE tests. */ public class PerformanceEvaluationCommons { - static final Log LOG = + private static final Log LOG = LogFactory.getLog(PerformanceEvaluationCommons.class.getName()); public static void assertValueSize(final int expectedSize, final int got) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java index 2d081647ff1..b82443be580 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java @@ -47,7 +47,7 @@ import org.junit.experimental.categories.Category; */ @Category({MiscTests.class, MediumTests.class}) public class TestGlobalMemStoreSize { - private final Log LOG = LogFactory.getLog(this.getClass().getName()); + private static final Log LOG = LogFactory.getLog(TestGlobalMemStoreSize.class); private static int regionServerNum = 4; private static int regionNum = 16; // total region num = region num + root and meta regions diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java index 861ddee8c5c..3a9c5650f43 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java @@ -49,7 +49,7 @@ import java.util.List; */ @Category({MiscTests.class, LargeTests.class}) public class TestHBaseTestingUtility { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestHBaseTestingUtility.class); /** * Basic sanity test that spins up multiple HDFS and HBase clusters that share diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java index 48a5dbd3d03..7d644bd9905 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java @@ -77,7 +77,7 @@ import com.google.common.collect.Lists; */ @Category({MiscTests.class, MediumTests.class}) public class TestIOFencing { - static final Log LOG = LogFactory.getLog(TestIOFencing.class); + private static final Log LOG = LogFactory.getLog(TestIOFencing.class); static { // Uncomment the following lines if more verbosity is needed for // debugging (see HBASE-12285 for details). diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java index 8ac35565141..ea7f18d7f0b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java @@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category; */ @Category({MiscTests.class, MediumTests.class}) public class TestInfoServers { - static final Log LOG = LogFactory.getLog(TestInfoServers.class); + private static final Log LOG = LogFactory.getLog(TestInfoServers.class); private final static HBaseTestingUtility UTIL = new HBaseTestingUtility(); @BeforeClass diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionsCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionsCleaner.java index 421d91ca094..8d3d2fc7356 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionsCleaner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionsCleaner.java @@ -37,7 +37,7 @@ import java.io.IOException; */ @Category({ MiscTests.class, MediumTests.class }) public class TestMovedRegionsCleaner { - public static final Log LOG = LogFactory.getLog(TestRegionRebalancing.class); + private static final Log LOG = LogFactory.getLog(TestRegionRebalancing.class); private final HBaseTestingUtility UTIL = new HBaseTestingUtility(); public static int numCalls = 0; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java index f47a8e04f40..ba24429c0a1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java @@ -57,7 +57,7 @@ import com.google.common.collect.Sets; @Category({MiscTests.class, MediumTests.class}) public class TestNamespace { - protected static final Log LOG = LogFactory.getLog(TestNamespace.class); + private static final Log LOG = LogFactory.getLog(TestNamespace.class); private static HMaster master; protected final static int NUM_SLAVES_BASE = 4; private static HBaseTestingUtility TEST_UTIL; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java index 93e74e8e9da..6842235bc63 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java @@ -65,7 +65,7 @@ public class TestRegionRebalancing { } private static final byte[] FAMILY_NAME = Bytes.toBytes("col"); - public static final Log LOG = LogFactory.getLog(TestRegionRebalancing.class); + private static final Log LOG = LogFactory.getLog(TestRegionRebalancing.class); private final HBaseTestingUtility UTIL = new HBaseTestingUtility(); private RegionLocator regionLocator; private HTableDescriptor desc; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestTableDescriptor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestTableDescriptor.java index 89029b9f139..59a7db94bc2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestTableDescriptor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestTableDescriptor.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertEquals; */ @Category(SmallTests.class) public class TestTableDescriptor { - final static Log LOG = LogFactory.getLog(TestTableDescriptor.class); + private static final Log LOG = LogFactory.getLog(TestTableDescriptor.class); @Test public void testPb() throws DeserializationException, IOException { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java index 23423fa1c3c..ec3521c85bd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java @@ -75,7 +75,7 @@ import org.junit.experimental.categories.Category; @Category({MiscTests.class, LargeTests.class}) public class TestZooKeeper { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestZooKeeper.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java index fd1eff7f3d1..62e8a34b412 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java @@ -77,7 +77,7 @@ import com.google.protobuf.ServiceException; */ @Category({LargeTests.class, ClientTests.class}) public class TestAdmin1 { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestAdmin1.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private Admin admin; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java index a1da4406edc..7dc57340bb3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java @@ -75,7 +75,7 @@ import com.google.protobuf.ServiceException; */ @Category({LargeTests.class, ClientTests.class}) public class TestAdmin2 { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestAdmin2.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private Admin admin; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java index 65483c973ea..8af1d9f573b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java @@ -54,7 +54,7 @@ import com.google.protobuf.ServiceException; */ @Category({MediumTests.class, ClientTests.class}) public class TestClientScannerRPCTimeout { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestClientScannerRPCTimeout.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final byte[] FAMILY = Bytes.toBytes("testFamily"); private static final byte[] QUALIFIER = Bytes.toBytes("testQualifier"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java index d3986b2cdc2..418a0ace96b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java @@ -55,7 +55,7 @@ import com.google.protobuf.ServiceException; @Category({MediumTests.class, ClientTests.class}) public class TestClientTimeouts { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestClientTimeouts.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); protected static int SLAVES = 1; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java index 2cb2cfc1529..00912048942 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java @@ -44,7 +44,7 @@ import org.junit.experimental.categories.Category; */ @Category({LargeTests.class, ClientTests.class}) public class TestCloneSnapshotFromClient { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestCloneSnapshotFromClient.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java index e2b915ffd29..90b77a82a12 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java @@ -55,7 +55,7 @@ import org.junit.experimental.categories.Category; @Category({MediumTests.class, ClientTests.class}) public class TestFastFail { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestFastFail.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static byte[] FAMILY = Bytes.toBytes("testFamily"); private static final Random random = new Random(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java index e337ce25492..21df1e965f3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java @@ -119,7 +119,7 @@ import org.junit.experimental.categories.Category; @Category({LargeTests.class, ClientTests.class}) @SuppressWarnings ("deprecation") public class TestFromClientSide { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestFromClientSide.class); protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static byte [] ROW = Bytes.toBytes("testRow"); private static byte [] FAMILY = Bytes.toBytes("testFamily"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java index 680dcfbb274..c69017bf129 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java @@ -51,7 +51,7 @@ import org.junit.experimental.categories.Category; @Category({LargeTests.class, ClientTests.class}) public class TestFromClientSide3 { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestFromClientSide3.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static byte[] FAMILY = Bytes.toBytes("testFamily"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java index 26fe485eab9..43ba2421dea 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java @@ -39,7 +39,7 @@ import org.junit.experimental.categories.Category; @Category({LargeTests.class, ClientTests.class}) public class TestHTableMultiplexer { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestHTableMultiplexer.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static byte[] FAMILY = Bytes.toBytes("testFamily"); private static byte[] QUALIFIER = Bytes.toBytes("testQualifier"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerFlushCache.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerFlushCache.java index f6c73ca9bdb..4091e58e8ae 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerFlushCache.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerFlushCache.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue; @Category({ LargeTests.class, ClientTests.class }) public class TestHTableMultiplexerFlushCache { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestHTableMultiplexerFlushCache.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static byte[] FAMILY = Bytes.toBytes("testFamily"); private static byte[] QUALIFIER1 = Bytes.toBytes("testQualifier_1"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java index 76516862bca..b14510972e5 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java @@ -66,7 +66,7 @@ import static org.junit.Assert.fail; */ @Category(MediumTests.class) public class TestMetaWithReplicas { - static final Log LOG = LogFactory.getLog(TestMetaWithReplicas.class); + private static final Log LOG = LogFactory.getLog(TestMetaWithReplicas.class); private final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); @Before diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java index abb919fc31e..ba6a71b0850 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java @@ -45,7 +45,7 @@ import org.junit.experimental.categories.Category; */ @Category({LargeTests.class, ClientTests.class}) public class TestMultipleTimestamps { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestMultipleTimestamps.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java index c5e6449945c..5284c8c65b1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java @@ -54,7 +54,7 @@ import org.junit.experimental.categories.Category; */ @Category({LargeTests.class, ClientTests.class}) public class TestRestoreSnapshotFromClient { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestRestoreSnapshotFromClient.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java index f9c80308448..f86f24835ce 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java @@ -47,7 +47,7 @@ public class TestScannerTimeout { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestScannerTimeout.class); private final static byte[] SOME_BYTES = Bytes.toBytes("f"); private final static TableName TABLE_NAME = TableName.valueOf("t"); private final static int NB_ROWS = 10; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSizeFailures.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSizeFailures.java index a0b0f70b442..71b2d724e67 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSizeFailures.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSizeFailures.java @@ -43,7 +43,7 @@ import com.google.common.collect.Maps; @Category(LargeTests.class) public class TestSizeFailures { - static final Log LOG = LogFactory.getLog(TestSizeFailures.class); + private static final Log LOG = LogFactory.getLog(TestSizeFailures.class); protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static byte [] FAMILY = Bytes.toBytes("testFamily"); protected static int SLAVES = 1; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java index 4843715d05f..7bff686346c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java @@ -47,7 +47,7 @@ import org.junit.experimental.categories.Category; */ @Category({MediumTests.class, ClientTests.class}) public class TestTimestampsFilter { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestTimestampsFilter.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/codec/CodecPerformance.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/codec/CodecPerformance.java index c63f3623c3b..104dd668e85 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/codec/CodecPerformance.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/codec/CodecPerformance.java @@ -44,6 +44,8 @@ import org.apache.hadoop.hbase.util.Bytes; @InterfaceAudience.Public @InterfaceStability.Evolving public class CodecPerformance { + /** @deprecated LOG variable would be made private. */ + @Deprecated public static final Log LOG = LogFactory.getLog(CodecPerformance.class); static Cell [] getCells(final int howMany) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/codec/TestCellMessageCodec.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/codec/TestCellMessageCodec.java index b51de804fff..da799377709 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/codec/TestCellMessageCodec.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/codec/TestCellMessageCodec.java @@ -43,7 +43,7 @@ import com.google.common.io.CountingOutputStream; @Category({MiscTests.class, SmallTests.class}) public class TestCellMessageCodec { - public static final Log LOG = LogFactory.getLog(TestCellMessageCodec.class); + private static final Log LOG = LogFactory.getLog(TestCellMessageCodec.class); @Test public void testEmptyWorks() throws IOException { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/conf/TestConfigurationManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/conf/TestConfigurationManager.java index fe56344930b..ab4ebc58b46 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/conf/TestConfigurationManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/conf/TestConfigurationManager.java @@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category; @Category({SmallTests.class, ClientTests.class}) public class TestConfigurationManager { - public static final Log LOG = LogFactory.getLog(TestConfigurationManager.class); + private static final Log LOG = LogFactory.getLog(TestConfigurationManager.class); class DummyConfigurationObserver implements ConfigurationObserver { private boolean notifiedOnChange = false; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpoint.java index 8aa8da1d817..4e4ff5ed6ee 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpoint.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpoint.java @@ -46,7 +46,7 @@ import com.google.protobuf.Service; */ public class ColumnAggregationEndpoint extends ColumnAggregationService implements Coprocessor, CoprocessorService { - static final Log LOG = LogFactory.getLog(ColumnAggregationEndpoint.class); + private static final Log LOG = LogFactory.getLog(ColumnAggregationEndpoint.class); private RegionCoprocessorEnvironment env = null; @Override diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpointNullResponse.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpointNullResponse.java index 43159460f09..6c0ea493442 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpointNullResponse.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpointNullResponse.java @@ -50,7 +50,7 @@ public class ColumnAggregationEndpointNullResponse extends ColumnAggregationServiceNullResponse implements Coprocessor, CoprocessorService { - static final Log LOG = LogFactory.getLog(ColumnAggregationEndpointNullResponse.class); + private static final Log LOG = LogFactory.getLog(ColumnAggregationEndpointNullResponse.class); private RegionCoprocessorEnvironment env = null; @Override public Service getService() { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpointWithErrors.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpointWithErrors.java index 54289ef1613..32d978cf371 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpointWithErrors.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpointWithErrors.java @@ -51,7 +51,7 @@ public class ColumnAggregationEndpointWithErrors extends ColumnAggregationWithErrorsProtos.ColumnAggregationServiceWithErrors implements Coprocessor, CoprocessorService { - static final Log LOG = LogFactory.getLog(ColumnAggregationEndpointWithErrors.class); + private static final Log LOG = LogFactory.getLog(ColumnAggregationEndpointWithErrors.class); private RegionCoprocessorEnvironment env = null; @Override public Service getService() { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java index f4981f17354..601db766024 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java @@ -78,7 +78,7 @@ import com.google.common.collect.ImmutableList; * It works with TestRegionObserverInterface to provide the test case. */ public class SimpleRegionObserver extends BaseRegionObserver { - static final Log LOG = LogFactory.getLog(TestRegionObserverInterface.class); + private static final Log LOG = LogFactory.getLog(TestRegionObserverInterface.class); final AtomicInteger ctBeforeDelete = new AtomicInteger(1); final AtomicInteger ctPreOpen = new AtomicInteger(0); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java index 82fa3c22942..4f5b84dc962 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java @@ -75,7 +75,7 @@ import org.mockito.Mockito; @Category({CoprocessorTests.class, SmallTests.class}) public class TestCoprocessorInterface { @Rule public TestName name = new TestName(); - static final Log LOG = LogFactory.getLog(TestCoprocessorInterface.class); + private static final Log LOG = LogFactory.getLog(TestCoprocessorInterface.class); private static final HBaseTestingUtility TEST_UTIL = HBaseTestingUtility.createLocalHTU(); static final Path DIR = TEST_UTIL.getDataTestDir(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java index 454a61d65ca..437801c9062 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java @@ -85,7 +85,7 @@ import org.junit.experimental.categories.Category; @Category({CoprocessorTests.class, MediumTests.class}) public class TestRegionObserverInterface { - static final Log LOG = LogFactory.getLog(TestRegionObserverInterface.class); + private static final Log LOG = LogFactory.getLog(TestRegionObserverInterface.class); public static final TableName TEST_TABLE = TableName.valueOf("TestTable"); public final static byte[] A = Bytes.toBytes("a"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java index 61908ead0f5..3ac2cc678e0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java @@ -52,7 +52,8 @@ import org.junit.experimental.categories.Category; */ @Category({CoprocessorTests.class, MediumTests.class}) public class TestRegionServerCoprocessorExceptionWithAbort { - static final Log LOG = LogFactory.getLog(TestRegionServerCoprocessorExceptionWithAbort.class); + private static final Log LOG = LogFactory.getLog( + TestRegionServerCoprocessorExceptionWithAbort.class); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final TableName TABLE_NAME = TableName.valueOf("observed_table"); @@ -162,4 +163,4 @@ public class TestRegionServerCoprocessorExceptionWithAbort { } } } -} \ No newline at end of file +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java index 2136c3c1551..5f2b7bdc166 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java @@ -85,7 +85,7 @@ import org.apache.commons.logging.LogFactory; @Category({CoprocessorTests.class, MediumTests.class}) public class TestRowProcessorEndpoint { - static final Log LOG = LogFactory.getLog(TestRowProcessorEndpoint.class); + private static final Log LOG = LogFactory.getLog(TestRowProcessorEndpoint.class); private static final TableName TABLE = TableName.valueOf("testtable"); private final static byte[] ROW = Bytes.toBytes("testrow"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java index 1c81adfb071..0a78fdd51d2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java @@ -122,7 +122,7 @@ public class TestColumnRangeFilter { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestColumnRangeFilter.class); /** * @throws java.lang.Exception diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java index add549a9141..0492b349540 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java @@ -53,7 +53,7 @@ import org.junit.experimental.categories.Category; @Category({FilterTests.class, SmallTests.class}) public class TestDependentColumnFilter { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestDependentColumnFilter.class); private static final byte[][] ROWS = { Bytes.toBytes("test1"),Bytes.toBytes("test2") }; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowAndColumnRangeFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowAndColumnRangeFilter.java index 565c7db52b4..9aaeaf622d9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowAndColumnRangeFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowAndColumnRangeFilter.java @@ -52,7 +52,7 @@ import com.google.common.collect.Lists; @Category({FilterTests.class, MediumTests.class}) public class TestFuzzyRowAndColumnRangeFilter { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestFuzzyRowAndColumnRangeFilter.class); /** * @throws java.lang.Exception diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java index c2d25de0053..6bc089f5f7a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java @@ -45,7 +45,7 @@ import org.junit.experimental.categories.Category; public class TestMultiRowRangeFilter { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestMultiRowRangeFilter.class); private byte[] family = Bytes.toBytes("family"); private byte[] qf = Bytes.toBytes("qf"); private byte[] value = Bytes.toBytes("val"); @@ -462,4 +462,4 @@ public class TestMultiRowRangeFilter { } return results.size(); } -} \ No newline at end of file +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java index b06dea1f52d..0165b3d23e8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java @@ -44,7 +44,7 @@ import org.junit.experimental.categories.Category; @Category({MiscTests.class, SmallTests.class}) public class TestGlobalFilter extends HttpServerFunctionalTest { - static final Log LOG = LogFactory.getLog(HttpServer.class); + private static final Log LOG = LogFactory.getLog(HttpServer.class); static final Set RECORDS = new TreeSet(); /** A very simple filter that records accessed uri's */ diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java index ffb924ccbd5..7adf18a7e83 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java @@ -75,7 +75,7 @@ import org.mortbay.util.ajax.JSON; @Category({MiscTests.class, SmallTests.class}) public class TestHttpServer extends HttpServerFunctionalTest { - static final Log LOG = LogFactory.getLog(TestHttpServer.class); + private static final Log LOG = LogFactory.getLog(TestHttpServer.class); private static HttpServer server; private static URL baseUrl; private static final int MAX_THREADS = 10; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java index 5854ea23b01..33618adc12d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java @@ -44,7 +44,7 @@ import org.junit.experimental.categories.Category; @Category({MiscTests.class, SmallTests.class}) public class TestPathFilter extends HttpServerFunctionalTest { - static final Log LOG = LogFactory.getLog(HttpServer.class); + private static final Log LOG = LogFactory.getLog(HttpServer.class); static final Set RECORDS = new TreeSet(); /** A very simple filter that records accessed uri's */ diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java index f9857e4dfd2..5ddc6d4445d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java @@ -45,7 +45,7 @@ import org.junit.experimental.categories.Category; @Category({MiscTests.class, SmallTests.class}) public class TestServletFilter extends HttpServerFunctionalTest { - static final Log LOG = LogFactory.getLog(HttpServer.class); + private static final Log LOG = LogFactory.getLog(HttpServer.class); static volatile String uri = null; /** A very simple filter which record the uri filtered. */ diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/resource/JerseyResource.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/resource/JerseyResource.java index e38ae0f841b..fa0a5eca17c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/resource/JerseyResource.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/resource/JerseyResource.java @@ -41,7 +41,7 @@ import org.mortbay.util.ajax.JSON; */ @Path("") public class JerseyResource { - static final Log LOG = LogFactory.getLog(JerseyResource.class); + private static final Log LOG = LogFactory.getLog(JerseyResource.class); public static final String PATH = "path"; public static final String OP = "op"; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java index d6423e80f5a..f6ade3210bd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java @@ -64,7 +64,7 @@ import static org.junit.Assert.assertEquals; */ @Category({IOTests.class, SmallTests.class}) public class TestHeapSize { - static final Log LOG = LogFactory.getLog(TestHeapSize.class); + private static final Log LOG = LogFactory.getLog(TestHeapSize.class); // List of classes implementing HeapSize // BatchOperation, BatchUpdate, BlockIndex, Entry, Entry, HStoreKey // KeyValue, LruBlockCache, LruHashMap, Put, WALKey diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java index 9e4b1c7fb1f..283f7c1ea38 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java @@ -60,7 +60,7 @@ import org.junit.experimental.categories.Category; */ @Category({IOTests.class, SmallTests.class}) public class TestHFile extends HBaseTestCase { - static final Log LOG = LogFactory.getLog(TestHFile.class); + private static final Log LOG = LogFactory.getLog(TestHFile.class); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static String ROOT_DIR = diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcHandlerException.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcHandlerException.java index 298f086a47b..8a6b0929b76 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcHandlerException.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcHandlerException.java @@ -58,7 +58,7 @@ import static org.mockito.Mockito.mock; @Category({RPCTests.class, SmallTests.class}) public class TestRpcHandlerException { - public static final Log LOG = LogFactory.getLog(TestRpcHandlerException.class); + private static final Log LOG = LogFactory.getLog(TestRpcHandlerException.class); static String example = "xyz"; static byte[] CELL_BYTES = example.getBytes(); static Cell CELL = new KeyValue(CELL_BYTES, CELL_BYTES, CELL_BYTES, CELL_BYTES); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java index 11ac43f88cd..144da149a3a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java @@ -60,7 +60,7 @@ import static org.mockito.Mockito.when; @Category({RPCTests.class, SmallTests.class}) public class TestSimpleRpcScheduler { - public static final Log LOG = LogFactory.getLog(TestSimpleRpcScheduler.class); + private static final Log LOG = LogFactory.getLog(TestSimpleRpcScheduler.class); private final RpcScheduler.Context CONTEXT = new RpcScheduler.Context() { @Override diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java index 147d8ee9775..f4ccc4e23f0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java @@ -109,7 +109,7 @@ public class TestHFileOutputFormat { private HBaseTestingUtility util = new HBaseTestingUtility(); - private static Log LOG = LogFactory.getLog(TestHFileOutputFormat.class); + private static final Log LOG = LogFactory.getLog(TestHFileOutputFormat.class); /** * Simple mapper that makes KeyValue output. diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java index 67a6c0a6b85..178eb5751dc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java @@ -108,7 +108,7 @@ public class TestHFileOutputFormat2 { private HBaseTestingUtility util = new HBaseTestingUtility(); - private static Log LOG = LogFactory.getLog(TestHFileOutputFormat2.class); + private static final Log LOG = LogFactory.getLog(TestHFileOutputFormat2.class); /** * Simple mapper that makes KeyValue output. diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java index a64b7e05df1..7ec026f1e76 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java @@ -64,7 +64,7 @@ import org.junit.experimental.categories.Category; @Category({MapReduceTests.class, LargeTests.class}) public class TestImportTSVWithOperationAttributes implements Configurable { - protected static final Log LOG = LogFactory.getLog(TestImportTSVWithOperationAttributes.class); + private static final Log LOG = LogFactory.getLog(TestImportTSVWithOperationAttributes.class); protected static final String NAME = TestImportTsv.class.getSimpleName(); protected static HBaseTestingUtility util = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java index 6754ce981f0..17ee461bbd9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java @@ -74,7 +74,7 @@ import org.junit.experimental.categories.Category; @Category({MapReduceTests.class, LargeTests.class}) public class TestImportTSVWithVisibilityLabels implements Configurable { - protected static final Log LOG = LogFactory.getLog(TestImportTSVWithVisibilityLabels.class); + private static final Log LOG = LogFactory.getLog(TestImportTSVWithVisibilityLabels.class); protected static final String NAME = TestImportTsv.class.getSimpleName(); protected static HBaseTestingUtility util = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java index 9e2e4be5bf0..7918274f291 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java @@ -67,7 +67,7 @@ import org.junit.experimental.categories.Category; @Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestImportTsv implements Configurable { - protected static final Log LOG = LogFactory.getLog(TestImportTsv.class); + private static final Log LOG = LogFactory.getLog(TestImportTsv.class); protected static final String NAME = TestImportTsv.class.getSimpleName(); protected static HBaseTestingUtility util = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java index e07353f80cf..2ca0ca5c706 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java @@ -79,7 +79,7 @@ import com.google.protobuf.ServiceException; */ @Category({MapReduceTests.class, LargeTests.class}) public class TestLoadIncrementalHFilesSplitRecovery { - final static Log LOG = LogFactory.getLog(TestHRegionServerBulkLoad.class); + private static final Log LOG = LogFactory.getLog(TestHRegionServerBulkLoad.class); static HBaseTestingUtility util; //used by secure subclass @@ -549,4 +549,4 @@ public class TestLoadIncrementalHFilesSplitRecovery { if (t != null) t.close(); } } -} \ No newline at end of file +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableInputFormat.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableInputFormat.java index 3226cc66b91..f2827acfa35 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableInputFormat.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableInputFormat.java @@ -59,7 +59,7 @@ import org.junit.experimental.categories.Category; @Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestMultiTableInputFormat { - static final Log LOG = LogFactory.getLog(TestMultiTableInputFormat.class); + private static final Log LOG = LogFactory.getLog(TestMultiTableInputFormat.class); static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); static final String TABLE_NAME = "scantest"; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java index 59854ee1690..0ac9d9fc39e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java @@ -55,7 +55,7 @@ import org.junit.experimental.categories.Category; */ @Category({MapReduceTests.class, MediumTests.class}) public class TestRowCounter { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestRowCounter.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final static String TABLE_NAME = "testRowCounter"; private final static String COL_FAM = "col_fam"; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java index c4b0c7409cd..5cca54bcd64 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java @@ -60,7 +60,7 @@ import org.junit.BeforeClass; */ public abstract class TestTableInputFormatScanBase { - static final Log LOG = LogFactory.getLog(TestTableInputFormatScanBase.class); + private static final Log LOG = LogFactory.getLog(TestTableInputFormatScanBase.class); static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); static final byte[] TABLE_NAME = Bytes.toBytes("scantest"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALRecordReader.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALRecordReader.java index d9fe0d02395..013053efa92 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALRecordReader.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALRecordReader.java @@ -60,7 +60,7 @@ import org.junit.experimental.categories.Category; */ @Category({MapReduceTests.class, MediumTests.class}) public class TestWALRecordReader { - private final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestWALRecordReader.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static Configuration conf; private static FileSystem fs; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java index ca9bc9c1a6b..67e18013b4d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java @@ -60,7 +60,7 @@ import org.junit.experimental.categories.Category; @Category({MasterTests.class, MediumTests.class}) public class TestMasterOperationsForRegionReplicas { - final static Log LOG = LogFactory.getLog(TestRegionPlacement.class); + private static final Log LOG = LogFactory.getLog(TestRegionPlacement.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static Connection CONNECTION = null; private static Admin ADMIN; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java index 39ad442e5de..7f95e757e73 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java @@ -44,7 +44,7 @@ import org.junit.experimental.categories.Category; @Category({MasterTests.class, LargeTests.class}) public class TestMasterShutdown { - public static final Log LOG = LogFactory.getLog(TestMasterShutdown.class); + private static final Log LOG = LogFactory.getLog(TestMasterShutdown.class); /** * Simple test of shutdown. @@ -151,4 +151,4 @@ public class TestMasterShutdown { util.shutdownMiniDFSCluster(); util.cleanupTestDir(); } -} \ No newline at end of file +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java index a00741f1eab..9cbf680ddab 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java @@ -69,7 +69,7 @@ import org.junit.experimental.categories.Category; @Category({MasterTests.class, MediumTests.class}) public class TestRegionPlacement { - final static Log LOG = LogFactory.getLog(TestRegionPlacement.class); + private static final Log LOG = LogFactory.getLog(TestRegionPlacement.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final static int SLAVES = 10; private static Connection CONNECTION; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement2.java index 3f34bc49887..7b2f920bc96 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement2.java @@ -46,7 +46,7 @@ import org.junit.experimental.categories.Category; @Category({MasterTests.class, MediumTests.class}) public class TestRegionPlacement2 { - final static Log LOG = LogFactory.getLog(TestRegionPlacement2.class); + private static final Log LOG = LogFactory.getLog(TestRegionPlacement2.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final static int SLAVES = 7; private final static int PRIMARY = Position.PRIMARY.ordinal(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestWarmupRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestWarmupRegion.java index bc45120bcfc..ed5d9199fee 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestWarmupRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestWarmupRegion.java @@ -52,7 +52,7 @@ import org.junit.Test; @Category({MasterTests.class, LargeTests.class}) @SuppressWarnings ("deprecation") public class TestWarmupRegion { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestWarmupRegion.class); protected TableName TABLENAME = TableName.valueOf("testPurgeFutureDeletes"); protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static byte [] ROW = Bytes.toBytes("testRow"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java index a2c86a1fbbb..ee166d0df10 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java @@ -37,7 +37,7 @@ import org.junit.experimental.categories.Category; @Category({MasterTests.class, SmallTests.class}) public class TestProcedureManager { - static final Log LOG = LogFactory.getLog(TestProcedureManager.class); + private static final Log LOG = LogFactory.getLog(TestProcedureManager.class); private static final int NUM_RS = 2; private static HBaseTestingUtility util = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java index 52d455224fa..a3e91aba034 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java @@ -56,7 +56,7 @@ import com.google.common.collect.Lists; @Category({MasterTests.class, MediumTests.class}) public class TestZKProcedureControllers { - static final Log LOG = LogFactory.getLog(TestZKProcedureControllers.class); + private static final Log LOG = LogFactory.getLog(TestZKProcedureControllers.class); private final static HBaseTestingUtility UTIL = new HBaseTestingUtility(); private static final String COHORT_NODE_NAME = "expected"; private static final String CONTROLLER_NODE_NAME = "controller"; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java index 18dd5ae035f..9343480602c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java @@ -53,7 +53,7 @@ import static org.junit.Assert.fail; */ @Category({ClientTests.class, MediumTests.class}) public class TestQuotaAdmin { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestQuotaAdmin.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); @@ -215,4 +215,4 @@ public class TestQuotaAdmin { scanner.close(); } } -} \ No newline at end of file +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java index 34239c04934..4288319084a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java @@ -47,7 +47,7 @@ import org.junit.experimental.categories.Category; */ @Category({MasterTests.class, MediumTests.class}) public class TestQuotaTableUtil { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestQuotaTableUtil.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private Connection connection; @@ -182,4 +182,4 @@ public class TestQuotaTableUtil { resQuotaNS = QuotaUtil.getUserQuota(this.connection, user, namespace); assertEquals(null, resQuotaNS); } -} \ No newline at end of file +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java index 66e19523de6..b4bc76461be 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java @@ -77,7 +77,7 @@ import org.junit.rules.TestName; */ @Category({VerySlowRegionServerTests.class, MediumTests.class}) // Starts 100 threads public class TestAtomicOperation { - static final Log LOG = LogFactory.getLog(TestAtomicOperation.class); + private static final Log LOG = LogFactory.getLog(TestAtomicOperation.class); @Rule public TestName name = new TestName(); Region region = null; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java index 4a3d35236d4..c4b26b9bce0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java @@ -55,7 +55,7 @@ import org.junit.experimental.categories.Category; @Category({RegionServerTests.class, MediumTests.class}) public class TestBlocksRead extends HBaseTestCase { - static final Log LOG = LogFactory.getLog(TestBlocksRead.class); + private static final Log LOG = LogFactory.getLog(TestBlocksRead.class); static final BloomType[] BLOOM_TYPE = new BloomType[] { BloomType.ROWCOL, BloomType.ROW, BloomType.NONE }; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java index 1d5c61b387a..2bd22a8712f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java @@ -57,7 +57,7 @@ public class TestColumnSeeking { private final static HBaseTestingUtility TEST_UTIL = HBaseTestingUtility.createLocalHTU(); - static final Log LOG = LogFactory.getLog(TestColumnSeeking.class); + private static final Log LOG = LogFactory.getLog(TestColumnSeeking.class); @SuppressWarnings("unchecked") @Test diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java index 9d1136e0862..9fa854b78b7 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java @@ -85,7 +85,7 @@ import org.mockito.stubbing.Answer; @Category({RegionServerTests.class, MediumTests.class}) public class TestCompaction { @Rule public TestName name = new TestName(); - static final Log LOG = LogFactory.getLog(TestCompaction.class.getName()); + private static final Log LOG = LogFactory.getLog(TestCompaction.class.getName()); private static final HBaseTestingUtility UTIL = HBaseTestingUtility.createLocalHTU(); protected Configuration conf = UTIL.getConfiguration(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java index d9894a5eef5..f809a97ee5c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java @@ -45,7 +45,7 @@ import org.junit.experimental.categories.Category; /** Unit tests to test retrieving table/region compaction state*/ @Category({VerySlowRegionServerTests.class, LargeTests.class}) public class TestCompactionState { - final static Log LOG = LogFactory.getLog(TestCompactionState.class); + private static final Log LOG = LogFactory.getLog(TestCompactionState.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final static Random random = new Random(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java index 622c14550eb..65ae38c183c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java @@ -63,7 +63,7 @@ import com.google.common.collect.Lists; /** memstore test case */ @Category({RegionServerTests.class, MediumTests.class}) public class TestDefaultMemStore extends TestCase { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestDefaultMemStore.class); private DefaultMemStore memstore; private static final int ROW_COUNT = 10; private static final int QUALIFIER_COUNT = ROW_COUNT; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 6abe0760604..d606495aaa4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -182,7 +182,7 @@ import com.google.protobuf.ByteString; public class TestHRegion { // Do not spin up clusters in here. If you need to spin up a cluster, do it // over in TestHRegionOnCluster. - static final Log LOG = LogFactory.getLog(TestHRegion.class); + private static final Log LOG = LogFactory.getLog(TestHRegion.class); @Rule public TestName name = new TestName(); private static final String COLUMN_FAMILY = "MyCF"; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java index 9c9cfdcc349..70ae657bdbf 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java @@ -101,7 +101,7 @@ import com.google.protobuf.ByteString; @Category(MediumTests.class) public class TestHRegionReplayEvents { - static final Log LOG = LogFactory.getLog(TestHRegion.class); + private static final Log LOG = LogFactory.getLog(TestHRegion.class); @Rule public TestName name = new TestName(); private static HBaseTestingUtility TEST_UTIL; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java index af495560efb..22e91f07e4b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java @@ -80,7 +80,7 @@ import static org.junit.Assert.assertThat; */ @Category({RegionServerTests.class, LargeTests.class}) public class TestHRegionServerBulkLoad { - final static Log LOG = LogFactory.getLog(TestHRegionServerBulkLoad.class); + private static final Log LOG = LogFactory.getLog(TestHRegionServerBulkLoad.class); private static HBaseTestingUtility UTIL = new HBaseTestingUtility(); private final static Configuration conf = UTIL.getConfiguration(); private final static byte[] QUAL = Bytes.toBytes("qual"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java index 81d681c8f35..1fe57d0f753 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java @@ -57,7 +57,7 @@ import org.junit.experimental.categories.Category; */ @Category({RegionServerTests.class, LargeTests.class}) public class TestJoinedScanners { - static final Log LOG = LogFactory.getLog(TestJoinedScanners.class); + private static final Log LOG = LogFactory.getLog(TestJoinedScanners.class); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final String DIR = TEST_UTIL.getDataTestDir("TestJoinedScanners").toString(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java index cc168049b18..a466c4debe9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java @@ -73,7 +73,7 @@ import org.junit.rules.TestName; @Category({RegionServerTests.class, MediumTests.class}) public class TestMajorCompaction { @Rule public TestName name = new TestName(); - static final Log LOG = LogFactory.getLog(TestMajorCompaction.class.getName()); + private static final Log LOG = LogFactory.getLog(TestMajorCompaction.class.getName()); private static final HBaseTestingUtility UTIL = HBaseTestingUtility.createLocalHTU(); protected Configuration conf = UTIL.getConfiguration(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java index b694fe2b351..2504d9c2f12 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java @@ -53,7 +53,7 @@ import org.junit.rules.TestName; @Category({RegionServerTests.class, MediumTests.class}) public class TestMinorCompaction { @Rule public TestName name = new TestName(); - static final Log LOG = LogFactory.getLog(TestMinorCompaction.class.getName()); + private static final Log LOG = LogFactory.getLog(TestMinorCompaction.class.getName()); private static final HBaseTestingUtility UTIL = HBaseTestingUtility.createLocalHTU(); protected Configuration conf = UTIL.getConfiguration(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java index ea668b06e2b..d9453b02a43 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java @@ -57,7 +57,7 @@ import org.junit.rules.TestName; */ @Category({RegionServerTests.class, MediumTests.class}) public class TestParallelPut { - static final Log LOG = LogFactory.getLog(TestParallelPut.class); + private static final Log LOG = LogFactory.getLog(TestParallelPut.class); @Rule public TestName name = new TestName(); private HRegion region = null; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java index 84cb355f81d..cdef3512b52 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java @@ -68,7 +68,7 @@ import org.junit.rules.TestName; @Category({RegionServerTests.class, SmallTests.class}) public class TestScanner { @Rule public TestName name = new TestName(); - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestScanner.class); private final static HBaseTestingUtility TEST_UTIL = HBaseTestingUtility.createLocalHTU(); private static final byte [] FIRST_ROW = HConstants.EMPTY_START_ROW; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java index 50545c9879e..df73ddd648e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java @@ -75,7 +75,7 @@ import com.google.protobuf.ServiceException; */ @Category(MediumTests.class) public class TestScannerHeartbeatMessages { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestScannerHeartbeatMessages.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java index 59793e03235..be18dd4f009 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java @@ -97,7 +97,7 @@ import com.google.common.collect.Lists; */ @Category({RegionServerTests.class, MediumTests.class}) public class TestStore { - public static final Log LOG = LogFactory.getLog(TestStore.class); + private static final Log LOG = LogFactory.getLog(TestStore.class); @Rule public TestName name = new TestName(); HStore store; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java index e5a50223ed5..e8eb13d197d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java @@ -73,7 +73,7 @@ import com.google.common.collect.Lists; */ @Category({RegionServerTests.class, SmallTests.class}) public class TestStoreFile extends HBaseTestCase { - static final Log LOG = LogFactory.getLog(TestStoreFile.class); + private static final Log LOG = LogFactory.getLog(TestStoreFile.class); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private CacheConfig cacheConf = new CacheConfig(TEST_UTIL.getConfiguration()); private static String ROOT_DIR = TEST_UTIL.getDataTestDir("TestStoreFile").toString(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java index fb4561b5df9..cfa1695d797 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java @@ -45,7 +45,7 @@ import org.junit.experimental.categories.Category; @Category({RegionServerTests.class, SmallTests.class}) public class TestWideScanner extends HBaseTestCase { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestWideScanner.class); static final byte[] A = Bytes.toBytes("A"); static final byte[] B = Bytes.toBytes("B"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java index 7c13c004817..6ebafc91b24 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java @@ -53,7 +53,7 @@ import org.apache.hadoop.io.compress.DefaultCodec; */ @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class SequenceFileLogWriter extends WriterBase { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(SequenceFileLogWriter.class); // The sequence file we delegate to. private SequenceFile.Writer writer; // This is the FSDataOutputStream instance that is the 'out' instance diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java index 77071ce1343..7d76117efd2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java @@ -82,7 +82,7 @@ import org.junit.rules.TestName; */ @Category({RegionServerTests.class, MediumTests.class}) public class TestFSHLog { - protected static final Log LOG = LogFactory.getLog(TestFSHLog.class); + private static final Log LOG = LogFactory.getLog(TestFSHLog.class); protected static Configuration conf; protected static FileSystem fs; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestProtobufLog.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestProtobufLog.java index 04cb2cefa44..c1df2259b31 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestProtobufLog.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestProtobufLog.java @@ -62,7 +62,7 @@ import org.junit.rules.TestName; */ @Category({RegionServerTests.class, MediumTests.class}) public class TestProtobufLog { - protected static final Log LOG = LogFactory.getLog(TestProtobufLog.class); + private static final Log LOG = LogFactory.getLog(TestProtobufLog.class); protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java index 25c83a895b8..2c00b33c256 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java @@ -48,7 +48,7 @@ import static org.junit.Assert.*; */ @Category({RegionServerTests.class, SmallTests.class}) public class TestWALActionsListener { - protected static final Log LOG = LogFactory.getLog(TestWALActionsListener.class); + private static final Log LOG = LogFactory.getLog(TestWALActionsListener.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java index 5310a2e6b47..64e81fa1ae9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java @@ -105,7 +105,7 @@ import org.mockito.Mockito; */ @Category({RegionServerTests.class, MediumTests.class}) public class TestWALReplay { - public static final Log LOG = LogFactory.getLog(TestWALReplay.class); + private static final Log LOG = LogFactory.getLog(TestWALReplay.class); static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final EnvironmentEdge ee = EnvironmentEdgeManager.getDelegate(); private Path hbaseRootDir = null; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java index 633dcc98b28..451c39ffb07 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java @@ -54,7 +54,7 @@ import org.junit.experimental.categories.Category; */ @Category({ReplicationTests.class, MediumTests.class}) public class TestReplicationEndpoint extends TestReplicationBase { - static final Log LOG = LogFactory.getLog(TestReplicationEndpoint.class); + private static final Log LOG = LogFactory.getLog(TestReplicationEndpoint.class); static int numRegionServers; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java index f85832e59e3..02b7f9a2b38 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java @@ -41,7 +41,7 @@ import com.google.common.collect.ImmutableSet; @Category({SecurityTests.class, SmallTests.class}) public class TestUser { - private static Log LOG = LogFactory.getLog(TestUser.class); + private static final Log LOG = LogFactory.getLog(TestUser.class); @Test public void testBasicAttributes() throws Exception { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java index 6bb2765217c..c83e502c5fc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java @@ -101,7 +101,7 @@ public class TestTokenAuthentication { System.setProperty("java.security.krb5.realm", "hbase"); System.setProperty("java.security.krb5.kdc", "blah"); } - private static Log LOG = LogFactory.getLog(TestTokenAuthentication.class); + private static final Log LOG = LogFactory.getLog(TestTokenAuthentication.class); public interface AuthenticationServiceSecurityInfo {} @@ -110,7 +110,7 @@ public class TestTokenAuthentication { */ private static class TokenServer extends TokenProvider implements AuthenticationProtos.AuthenticationService.BlockingInterface, Runnable, Server { - private static Log LOG = LogFactory.getLog(TokenServer.class); + private static final Log LOG = LogFactory.getLog(TokenServer.class); private Configuration conf; private RpcServerInterface rpcServer; private InetSocketAddress isa; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java index 9552ad3335b..857cdd0ad16 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java @@ -47,7 +47,7 @@ import org.junit.experimental.categories.Category; */ @Category({SecurityTests.class, LargeTests.class}) public class TestZKSecretWatcher { - private static Log LOG = LogFactory.getLog(TestZKSecretWatcher.class); + private static final Log LOG = LogFactory.getLog(TestZKSecretWatcher.class); private static HBaseTestingUtility TEST_UTIL; private static AuthenticationTokenSecretManager KEY_MASTER; private static AuthenticationTokenSecretManagerForTest KEY_SLAVE; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java index 3297002ff7e..b7a62405084 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java @@ -56,7 +56,8 @@ import com.google.protobuf.ByteString; @Category({SecurityTests.class, MediumTests.class}) public class TestVisibilityLabelsWithDefaultVisLabelService extends TestVisibilityLabels { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog( + TestVisibilityLabelsWithDefaultVisLabelService.class); @BeforeClass public static void setupBeforeClass() throws Exception { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java index 2774bee6978..71a39f066fc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java @@ -64,7 +64,7 @@ import org.junit.experimental.categories.Category; */ @Category({VerySlowRegionServerTests.class, MediumTests.class}) public class TestExportSnapshot { - private final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestExportSnapshot.class); protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java index ae1ca136b80..219e694c557 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java @@ -49,7 +49,7 @@ import org.junit.experimental.categories.Category; */ @Category({RegionServerTests.class, LargeTests.class}) public class TestRestoreFlushSnapshotFromClient { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestRestoreFlushSnapshotFromClient.class); private final static HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java index 7309580762b..3fac2fda80f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java @@ -51,7 +51,7 @@ import org.mockito.Mockito; */ @Category({RegionServerTests.class, SmallTests.class}) public class TestRestoreSnapshotHelper { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestRestoreSnapshotHelper.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final static String TEST_HFILE = "abc"; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java index 9f2b0b83393..1fcfcbb1f74 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java @@ -36,7 +36,7 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; * Basic mock Server for handler tests. */ public class MockServer implements Server { - static final Log LOG = LogFactory.getLog(MockServer.class); + private static final Log LOG = LogFactory.getLog(MockServer.class); final static ServerName NAME = ServerName.valueOf("MockServer", 123, -1); boolean stopped; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java index c5bd284aef8..43c7cfc6e32 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java @@ -41,7 +41,7 @@ import static org.junit.Assert.*; @Category({MiscTests.class, SmallTests.class}) public class TestCompressionTest { - static final Log LOG = LogFactory.getLog(TestCompressionTest.class); + private static final Log LOG = LogFactory.getLog(TestCompressionTest.class); @Test public void testExceptionCaching() { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java index 76003883d54..866382dda2d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java @@ -74,7 +74,7 @@ import org.junit.runners.Parameterized.Parameters; @Category({MiscTests.class, MediumTests.class}) @RunWith(Parameterized.class) public class TestCoprocessorScanPolicy { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestCoprocessorScanPolicy.class); protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final byte[] F = Bytes.toBytes("fam"); private static final byte[] Q = Bytes.toBytes("qual"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSVisitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSVisitor.java index d1516ca45b5..142e46ee7c6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSVisitor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSVisitor.java @@ -43,7 +43,7 @@ import org.junit.experimental.categories.Category; */ @Category({MiscTests.class, MediumTests.class}) public class TestFSVisitor { - final Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(TestFSVisitor.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java index 4a741a9819f..17dab15d426 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java @@ -132,8 +132,7 @@ import com.google.common.collect.Multimap; @Category({MiscTests.class, LargeTests.class}) public class TestHBaseFsck { static final int POOL_SIZE = 7; - - final static Log LOG = LogFactory.getLog(TestHBaseFsck.class); + private static final Log LOG = LogFactory.getLog(TestHBaseFsck.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final static Configuration conf = TEST_UTIL.getConfiguration(); private final static String FAM_STR = "fam"; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java index 056eeb2fee7..64001865fda 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java @@ -54,7 +54,7 @@ import org.junit.experimental.categories.Category; /** Test stand alone merge tool that can merge arbitrary regions */ @Category({MiscTests.class, LargeTests.class}) public class TestMergeTool extends HBaseTestCase { - static final Log LOG = LogFactory.getLog(TestMergeTool.class); + private static final Log LOG = LogFactory.getLog(TestMergeTool.class); HBaseTestingUtility TEST_UTIL; // static final byte [] COLUMN_NAME = Bytes.toBytes("contents:"); static final byte [] FAMILY = Bytes.toBytes("contents"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java index e940425e6cb..f7f1f434e8b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java @@ -75,7 +75,7 @@ import org.junit.experimental.categories.Category; */ @Category({MiscTests.class, LargeTests.class}) public class OfflineMetaRebuildTestCore { - protected final static Log LOG = LogFactory + private final static Log LOG = LogFactory .getLog(OfflineMetaRebuildTestCore.class); protected HBaseTestingUtility TEST_UTIL; protected Configuration conf; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java index d4f86e985ff..17a208f8331 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java @@ -25,6 +25,8 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; @@ -41,6 +43,7 @@ import org.junit.experimental.categories.Category; */ @Category({MiscTests.class, MediumTests.class}) public class TestOfflineMetaRebuildBase extends OfflineMetaRebuildTestCore { + private static final Log LOG = LogFactory.getLog(TestOfflineMetaRebuildBase.class); @SuppressWarnings("deprecation") @Test(timeout = 120000) @@ -94,4 +97,4 @@ public class TestOfflineMetaRebuildBase extends OfflineMetaRebuildTestCore { LOG.info("Table " + table + " has " + tableRowCount(conf, table) + " entries."); assertEquals(16, tableRowCount(conf, table)); } -} \ No newline at end of file +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java index 6320b93c471..615487d8c11 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java @@ -24,6 +24,8 @@ import static org.junit.Assert.assertFalse; import java.util.Arrays; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MiscTests; @@ -38,6 +40,7 @@ import org.junit.experimental.categories.Category; */ @Category({MiscTests.class, MediumTests.class}) public class TestOfflineMetaRebuildHole extends OfflineMetaRebuildTestCore { + private final static Log LOG = LogFactory.getLog(TestOfflineMetaRebuildHole.class); @Test(timeout = 120000) public void testMetaRebuildHoleFail() throws Exception { @@ -95,4 +98,4 @@ public class TestOfflineMetaRebuildHole extends OfflineMetaRebuildTestCore { ERROR_CODE.NOT_IN_META_OR_DEPLOYED, ERROR_CODE.NOT_IN_META_OR_DEPLOYED}); } -} \ No newline at end of file +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java index e49b1546eb6..40ba86a4d18 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java @@ -24,6 +24,8 @@ import static org.junit.Assert.assertFalse; import java.util.Arrays; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MiscTests; @@ -41,6 +43,7 @@ import com.google.common.collect.Multimap; */ @Category({MiscTests.class, MediumTests.class}) public class TestOfflineMetaRebuildOverlap extends OfflineMetaRebuildTestCore { + private final static Log LOG = LogFactory.getLog(TestOfflineMetaRebuildOverlap.class); @Test(timeout = 120000) public void testMetaRebuildOverlapFail() throws Exception { @@ -105,4 +108,4 @@ public class TestOfflineMetaRebuildOverlap extends OfflineMetaRebuildTestCore { ERROR_CODE.NOT_IN_META_OR_DEPLOYED, ERROR_CODE.NOT_IN_META_OR_DEPLOYED}); } -} \ No newline at end of file +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java index df8ceaf2802..cf0488ad616 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java @@ -61,7 +61,7 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit; @Category({RegionServerTests.class, MediumTests.class}) public class TestDefaultWALProvider { - protected static final Log LOG = LogFactory.getLog(TestDefaultWALProvider.class); + private static final Log LOG = LogFactory.getLog(TestDefaultWALProvider.class); protected static Configuration conf; protected static FileSystem fs; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestSecureWAL.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestSecureWAL.java index 6f05839311f..6ae8ee1532c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestSecureWAL.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestSecureWAL.java @@ -58,7 +58,7 @@ import org.junit.experimental.categories.Category; @Category({RegionServerTests.class, MediumTests.class}) public class TestSecureWAL { - static final Log LOG = LogFactory.getLog(TestSecureWAL.class); + private static final Log LOG = LogFactory.getLog(TestSecureWAL.class); static { ((Log4JLogger)LogFactory.getLog("org.apache.hadoop.hbase.regionserver.wal")) .getLogger().setLevel(Level.ALL); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java index bbe4018bc43..fdc8e4518df 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java @@ -81,7 +81,7 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit; */ @Category({RegionServerTests.class, MediumTests.class}) public class TestWALFactory { - protected static final Log LOG = LogFactory.getLog(TestWALFactory.class); + private static final Log LOG = LogFactory.getLog(TestWALFactory.class); protected static Configuration conf; private static MiniDFSCluster cluster; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALReaderOnSecureWAL.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALReaderOnSecureWAL.java index deaef50b3ef..52e28eb9bcf 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALReaderOnSecureWAL.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALReaderOnSecureWAL.java @@ -67,7 +67,7 @@ import org.apache.hadoop.hbase.regionserver.wal.SecureWALCellCodec; */ @Category({RegionServerTests.class, MediumTests.class}) public class TestWALReaderOnSecureWAL { - static final Log LOG = LogFactory.getLog(TestWALReaderOnSecureWAL.class); + private static final Log LOG = LogFactory.getLog(TestWALReaderOnSecureWAL.class); static { ((Log4JLogger)LogFactory.getLog("org.apache.hadoop.hbase.regionserver.wal")) .getLogger().setLevel(Level.ALL); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java index 05d5e510c4f..7d4a0f80318 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java @@ -83,7 +83,7 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit; */ @InterfaceAudience.Private public final class WALPerformanceEvaluation extends Configured implements Tool { - static final Log LOG = LogFactory.getLog(WALPerformanceEvaluation.class.getName()); + private static final Log LOG = LogFactory.getLog(WALPerformanceEvaluation.class.getName()); private final MetricsRegistry metrics = new MetricsRegistry(); private final Meter syncMeter = metrics.newMeter(WALPerformanceEvaluation.class, "syncMeter", "syncs", TimeUnit.MILLISECONDS); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java index c830b043415..1faf8e52e05 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java @@ -38,7 +38,7 @@ import org.junit.experimental.categories.Category; */ @Category({MiscTests.class, MediumTests.class}) public class TestZKLeaderManager { - private static Log LOG = LogFactory.getLog(TestZKLeaderManager.class); + private static final Log LOG = LogFactory.getLog(TestZKLeaderManager.class); private static final String LEADER_ZNODE = "/test/" + TestZKLeaderManager.class.getSimpleName(); diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/CallQueue.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/CallQueue.java index e609a715708..59e5856bd7c 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/CallQueue.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/CallQueue.java @@ -35,7 +35,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public class CallQueue implements BlockingQueue { - private static Log LOG = LogFactory.getLog(CallQueue.class); + private static final Log LOG = LogFactory.getLog(CallQueue.class); private final BlockingQueue underlyingQueue; private final ThriftMetrics metrics; diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/HbaseHandlerMetricsProxy.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/HbaseHandlerMetricsProxy.java index b5498ba598e..51a0444a620 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/HbaseHandlerMetricsProxy.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/HbaseHandlerMetricsProxy.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.thrift.generated.Hbase; @InterfaceAudience.Private public class HbaseHandlerMetricsProxy implements InvocationHandler { - public static final Log LOG = LogFactory.getLog( + private static final Log LOG = LogFactory.getLog( HbaseHandlerMetricsProxy.class); private final Hbase.Iface handler; diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java index bdbe4456b9c..13a2e5034ab 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java @@ -161,7 +161,7 @@ public class IncrementCoalescer implements IncrementCoalescerMBean { private int maxQueueSize = 500000; private static final int CORE_POOL_SIZE = 1; - protected final Log LOG = LogFactory.getLog(this.getClass().getName()); + private static final Log LOG = LogFactory.getLog(FullyQualifiedRow.class); @SuppressWarnings("deprecation") public IncrementCoalescer(HBaseHandler hand) { diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftHttpServlet.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftHttpServlet.java index c7ea46f61e1..28aa0e14090 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftHttpServlet.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftHttpServlet.java @@ -51,7 +51,7 @@ import org.ietf.jgss.Oid; @InterfaceAudience.Private public class ThriftHttpServlet extends TServlet { private static final long serialVersionUID = 1L; - public static final Log LOG = LogFactory.getLog(ThriftHttpServlet.class.getName()); + private static final Log LOG = LogFactory.getLog(ThriftHttpServlet.class.getName()); private transient final UserGroupInformation realUser; private transient final Configuration conf; private final boolean securityEnabled; diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java index 4e4ade37b2a..daf320ce326 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java @@ -631,7 +631,7 @@ public class ThriftServerRunner implements Runnable { */ public static class HBaseHandler implements Hbase.Iface { protected Configuration conf; - protected final Log LOG = LogFactory.getLog(this.getClass().getName()); + protected static final Log LOG = LogFactory.getLog(HBaseHandler.class); // nextScannerId and scannerMap are used to manage scanner state protected int nextScannerId = 0; diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java index 189f17e926f..b6460099188 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java @@ -45,7 +45,7 @@ import org.junit.Test; @RunWith(Parameterized.class) public class TestCallQueue { - public static final Log LOG = LogFactory.getLog(TestCallQueue.class); + private static final Log LOG = LogFactory.getLog(TestCallQueue.class); private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); private static final MetricsAssertHelper metricsHelper = diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java index 9341ffa8735..f105f3dd773 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java @@ -49,7 +49,7 @@ import com.google.common.base.Joiner; public class TestThriftHttpServer { - public static final Log LOG = + private static final Log LOG = LogFactory.getLog(TestThriftHttpServer.class); private static final HBaseTestingUtility TEST_UTIL = diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java index 9446d2f40db..82d5bb1a497 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java @@ -61,7 +61,7 @@ import com.google.common.base.Joiner; @RunWith(Parameterized.class) public class TestThriftServerCmdLine { - public static final Log LOG = + private static final Log LOG = LogFactory.getLog(TestThriftServerCmdLine.class); private final ImplType implType; diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java index f4df2713dcb..5b7a80821f0 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java @@ -89,7 +89,7 @@ import static java.nio.ByteBuffer.wrap; @Category({ClientTests.class, MediumTests.class}) public class TestThriftHBaseServiceHandler { - public static final Log LOG = LogFactory.getLog(TestThriftHBaseServiceHandler.class); + private static final Log LOG = LogFactory.getLog(TestThriftHBaseServiceHandler.class); private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); // Static names for tables, columns, rows, and values diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandlerWithLabels.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandlerWithLabels.java index 42d1b08dd57..6c80907871a 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandlerWithLabels.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandlerWithLabels.java @@ -74,7 +74,7 @@ import org.junit.experimental.categories.Category; @Category({ClientTests.class, MediumTests.class}) public class TestThriftHBaseServiceHandlerWithLabels { -public static final Log LOG = LogFactory + private static final Log LOG = LogFactory .getLog(TestThriftHBaseServiceHandlerWithLabels.class); private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();