Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2B76D200CFA for ; Tue, 5 Sep 2017 18:47:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 29F051609DB; Tue, 5 Sep 2017 16:47:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AFAF51609EA for ; Tue, 5 Sep 2017 18:46:59 +0200 (CEST) Received: (qmail 82793 invoked by uid 500); 5 Sep 2017 16:46:58 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 82568 invoked by uid 99); 5 Sep 2017 16:46:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Sep 2017 16:46:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 166AAF567C; Tue, 5 Sep 2017 16:46:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Date: Tue, 05 Sep 2017 16:47:00 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] hbase git commit: HBASE-18674 upgrading to commons-lang3 archived-at: Tue, 05 Sep 2017 16:47:02 -0000 HBASE-18674 upgrading to commons-lang3 Signed-off-by: Michael Stack Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bd219c0f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bd219c0f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bd219c0f Branch: refs/heads/branch-2 Commit: bd219c0fb83e542c895d7a2042e87b8819f8d4d2 Parents: 5c12462 Author: Umesh Agashe Authored: Thu Aug 24 11:10:17 2017 -0700 Committer: Michael Stack Committed: Tue Sep 5 09:46:49 2017 -0700 ---------------------------------------------------------------------- dev-support/docker/Dockerfile | 2 +- hbase-backup/pom.xml | 4 +-- .../apache/hadoop/hbase/backup/BackupInfo.java | 2 +- .../hadoop/hbase/backup/RestoreDriver.java | 2 +- .../hbase/backup/impl/BackupAdminImpl.java | 2 +- .../hbase/backup/impl/BackupCommands.java | 2 +- .../hbase/backup/impl/BackupSystemTable.java | 2 +- .../impl/IncrementalTableBackupClient.java | 2 +- .../hbase/backup/impl/RestoreTablesClient.java | 2 +- .../mapreduce/MapReduceBackupMergeJob.java | 2 +- .../backup/mapreduce/MapReduceRestoreJob.java | 2 +- .../hadoop/hbase/backup/util/BackupSet.java | 2 +- .../hadoop/hbase/backup/TestFullRestore.java | 4 +-- .../TestIncrementalBackupMergeWithFailures.java | 2 +- hbase-client/pom.xml | 4 +-- .../hadoop/hbase/client/ClientScanner.java | 2 +- .../client/FastFailInterceptorContext.java | 4 +-- .../client/PreemptiveFastFailInterceptor.java | 2 +- .../hadoop/hbase/client/ZKAsyncRegistry.java | 4 +-- .../replication/ReplicationSerDeHelper.java | 2 +- .../hbase/client/replication/TableCFs.java | 2 +- .../hbase/ipc/NettyRpcClientConfigHelper.java | 2 +- .../hadoop/hbase/quotas/SpaceQuotaSnapshot.java | 2 +- .../apache/hadoop/hbase/zookeeper/ZKUtil.java | 2 +- .../hbase/client/TestClientNoCluster.java | 14 ++++----- .../hadoop/hbase/ipc/TestCellBlockBuilder.java | 2 +- hbase-common/pom.xml | 4 +-- .../org/apache/hadoop/hbase/HConstants.java | 4 ++- .../hbase/io/encoding/EncodedDataBlock.java | 2 +- .../hadoop/hbase/util/PairOfSameType.java | 5 +-- hbase-hadoop2-compat/pom.xml | 4 +-- .../impl/HBaseMetrics2HadoopMetricsAdapter.java | 2 +- .../hadoop/metrics2/lib/MutableHistogram.java | 2 +- hbase-it/pom.xml | 4 +-- .../hadoop/hbase/DistributedHBaseCluster.java | 4 +-- .../hadoop/hbase/HBaseClusterManager.java | 2 +- .../hadoop/hbase/IntegrationTestBase.java | 2 +- .../hbase/IntegrationTestDDLMasterFailover.java | 32 +++++++++---------- .../hbase/IntegrationTestIngestWithACL.java | 2 +- .../StripeCompactionsPerformanceEvaluation.java | 2 +- .../hadoop/hbase/chaos/actions/Action.java | 6 ++-- .../hbase/chaos/actions/AddColumnAction.java | 2 +- .../hbase/chaos/actions/CompactMobAction.java | 4 +-- .../CompactRandomRegionOfTableAction.java | 4 +-- .../hbase/chaos/actions/CompactTableAction.java | 4 +-- ...MergeRandomAdjacentRegionsOfTableAction.java | 4 +-- .../chaos/actions/MoveRegionsOfTableAction.java | 4 +-- .../actions/RestartRsHoldingTableAction.java | 4 +-- .../actions/RollingBatchRestartRsAction.java | 6 ++-- .../UnbalanceKillAndRebalanceAction.java | 4 +-- .../chaos/actions/UnbalanceRegionsAction.java | 4 +-- .../chaos/monkies/PolicyBasedChaosMonkey.java | 6 ++-- .../hbase/chaos/policies/PeriodicPolicy.java | 4 +-- .../hbase/chaos/util/ChaosMonkeyRunner.java | 2 +- .../mapreduce/IntegrationTestBulkLoad.java | 2 +- .../hadoop/hbase/mttr/IntegrationTestMTTR.java | 2 +- ...stTimeBoundedRequestsWithRegionReplicas.java | 2 +- hbase-mapreduce/pom.xml | 4 +-- .../hbase/mapreduce/HFileOutputFormat2.java | 2 +- .../hadoop/hbase/mapreduce/ImportTsv.java | 2 +- .../hadoop/hbase/mapreduce/RowCounter.java | 2 +- .../hadoop/hbase/PerformanceEvaluation.java | 2 +- hbase-metrics-api/pom.xml | 4 +-- .../hbase/metrics/MetricRegistryInfo.java | 2 +- hbase-replication/pom.xml | 4 +-- .../hbase/replication/ReplicationFactory.java | 2 +- .../TableBasedReplicationQueuesClientImpl.java | 9 +++--- .../TableBasedReplicationQueuesImpl.java | 14 ++++----- .../src/main/resources/META-INF/NOTICE.vm | 12 +++++++ hbase-rest/pom.xml | 4 +-- .../apache/hadoop/hbase/rest/RESTServer.java | 2 +- .../apache/hadoop/hbase/rest/RowResource.java | 2 +- .../apache/hadoop/hbase/rest/TableResource.java | 2 +- .../hadoop/hbase/rest/model/CellModel.java | 6 ++-- .../hadoop/hbase/rest/model/RowModel.java | 6 ++-- .../hbase/rest/HBaseRESTTestingUtility.java | 2 +- .../hadoop/hbase/rest/model/TestCellModel.java | 6 ++-- .../hadoop/hbase/rest/model/TestRowModel.java | 6 ++-- hbase-rsgroup/pom.xml | 4 +-- .../hbase/rsgroup/RSGroupAdminServer.java | 2 +- .../balancer/TestRSGroupBasedLoadBalancer.java | 2 +- hbase-server/pom.xml | 4 +-- .../tmpl/regionserver/RegionListTmpl.jamon | 2 +- .../ZkSplitLogWorkerCoordination.java | 6 ++-- .../favored/FavoredNodeAssignmentHelper.java | 2 +- .../FanOutOneBlockAsyncDFSOutputSaslHelper.java | 2 +- .../hbase/io/hfile/HFilePrettyPrinter.java | 2 +- .../hbase/master/MasterCoprocessorHost.java | 2 +- .../hbase/master/MetricsMasterWrapperImpl.java | 2 +- .../hbase/master/RegionPlacementMaintainer.java | 2 +- .../hbase/master/TableNamespaceManager.java | 4 +-- .../hbase/master/balancer/BaseLoadBalancer.java | 10 ++---- .../hadoop/hbase/quotas/MasterQuotaManager.java | 2 +- .../quotas/SnapshotQuotaObserverChore.java | 2 +- .../hadoop/hbase/regionserver/CellSet.java | 33 ++++++++++---------- .../hbase/regionserver/HRegionServer.java | 8 ++--- .../MetricsRegionServerWrapperImpl.java | 2 +- .../regionserver/NonLazyKeyValueScanner.java | 2 +- .../NonReversedNonLazyKeyValueScanner.java | 2 +- .../hbase/regionserver/RSRpcServices.java | 2 +- .../regionserver/RegionCoprocessorHost.java | 2 +- .../RegionServerCoprocessorHost.java | 2 +- .../regionserver/ReversedKeyValueHeap.java | 5 +-- .../hbase/regionserver/SegmentScanner.java | 2 +- .../hbase/regionserver/wal/AbstractFSWAL.java | 4 +-- .../HBaseInterClusterReplicationEndpoint.java | 4 +-- .../regionserver/ReplicationSink.java | 2 +- .../regionserver/ReplicationSource.java | 2 +- .../security/visibility/VisibilityUtils.java | 2 +- .../org/apache/hadoop/hbase/tool/Canary.java | 4 +-- .../hbase/tool/LoadIncrementalHFiles.java | 2 +- .../hadoop/hbase/util/CompressionTest.java | 2 +- .../hadoop/hbase/util/FSTableDescriptors.java | 4 +-- .../org/apache/hadoop/hbase/util/HBaseFsck.java | 4 +-- .../hadoop/hbase/util/RegionSplitter.java | 4 +-- .../hbase/util/hbck/OfflineMetaRepair.java | 2 +- .../hbase/wal/NettyAsyncFSWALConfigHelper.java | 2 +- .../hbase-webapps/master/procedures.jsp | 2 +- .../hbase-webapps/master/processMaster.jsp | 2 +- .../hbase-webapps/master/processRS.jsp | 2 +- .../resources/hbase-webapps/master/table.jsp | 26 +++++++-------- .../hbase-webapps/master/tablesDetailed.jsp | 2 +- .../main/resources/hbase-webapps/master/zk.jsp | 4 +-- .../hbase-webapps/regionserver/processRS.jsp | 2 +- .../hbase-webapps/regionserver/region.jsp | 2 +- .../hadoop/hbase/HBaseTestingUtility.java | 2 +- .../hadoop/hbase/client/TestFromClientSide.java | 2 +- .../TestSaslFanOutOneBlockAsyncDFSOutput.java | 2 +- .../master/balancer/TestBaseLoadBalancer.java | 4 +-- ...ProcedureSchedulerPerformanceEvaluation.java | 2 +- .../hbase/namespace/TestNamespaceAuditor.java | 2 +- .../hadoop/hbase/regionserver/TestHRegion.java | 2 +- .../regionserver/TestMultiColumnScanner.java | 2 +- .../TestRegionMergeTransactionOnCluster.java | 4 +-- .../TestScannerHeartbeatMessages.java | 2 +- .../regionserver/TestSplitWalDataLoss.java | 2 +- .../TestTimestampFilterSeekHint.java | 2 +- .../compactions/MockStoreFileGenerator.java | 2 +- .../hadoop/hbase/security/TestSecureIPC.java | 4 +-- .../apache/hadoop/hbase/security/TestUser.java | 2 +- .../hadoop/hbase/util/MultiThreadedReader.java | 6 ++-- .../hadoop/hbase/util/MultiThreadedUpdater.java | 6 ++-- .../hadoop/hbase/util/TestRegionSplitter.java | 2 +- hbase-shaded/pom.xml | 4 +-- hbase-spark-it/pom.xml | 4 +-- .../spark/IntegrationTestSparkBulkLoad.java | 2 +- hbase-thrift/pom.xml | 4 +-- .../hadoop/hbase/thrift/ThriftServerRunner.java | 2 +- pom.xml | 8 ++--- src/main/asciidoc/_chapters/configuration.adoc | 2 +- 150 files changed, 291 insertions(+), 279 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/dev-support/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index c654ded..62c6030 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -87,7 +87,7 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ # Fixing the Apache commons / Maven dependency problem under Ubuntu: # See http://wiki.apache.org/commons/VfsProblems -RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar . +RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang3-3.6.jar . ###### # Install findbugs http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml index 5511ac1..2085497 100644 --- a/hbase-backup/pom.xml +++ b/hbase-backup/pom.xml @@ -142,8 +142,8 @@ commons-cli - commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-logging http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java index 1765bf3..432fd37 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.TableName; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java index 2a1458c..b081533 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java @@ -38,7 +38,7 @@ import java.util.List; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java index 99fb06c..6cef0e3 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java index 187a014..c87b557 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java @@ -42,7 +42,7 @@ import java.util.List; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileSystem; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java index 4dab046..8dc9718 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java @@ -31,7 +31,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java index 6d48c32..4064948 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.FileSystem; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java index ff79533..845da56 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.java index 00c5b83..373f143 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.java index 93ea2e5..adc5aa8 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.java @@ -22,7 +22,7 @@ import static org.apache.hadoop.hbase.backup.util.BackupUtils.succeeded; import java.io.IOException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupSet.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupSet.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupSet.java index 0da6fc4..098efa1 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupSet.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupSet.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.backup.util; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullRestore.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullRestore.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullRestore.java index 48a553f..3ca79f6 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullRestore.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullRestore.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.TableName; @@ -342,4 +342,4 @@ public class TestFullRestore extends TestBackupBase { int ret = ToolRunner.run(conf1, new RestoreDriver(), args); assertTrue(ret != 0); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.java index 7011ed3..011ddf2 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 6ffa3a3..5c5f075 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -151,8 +151,8 @@ commons-io - commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-logging http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java index 2522434..5e2585a 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 @@ -29,7 +29,7 @@ import java.util.LinkedList; import java.util.Queue; import java.util.concurrent.ExecutorService; -import org.apache.commons.lang.mutable.MutableBoolean; +import org.apache.commons.lang3.mutable.MutableBoolean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/FastFailInterceptorContext.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/FastFailInterceptorContext.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/FastFailInterceptorContext.java index 3f44836..c033828 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/FastFailInterceptorContext.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/FastFailInterceptorContext.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.commons.lang.mutable.MutableBoolean; +import org.apache.commons.lang3.mutable.MutableBoolean; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.classification.InterfaceAudience; @@ -129,4 +129,4 @@ class FastFailInterceptorContext extends RetryingCallerInterceptorContext { this.tries = tries; return this; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java ---------------------------------------------------------------------- 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 52ec9cd..9993742 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 @@ -26,7 +26,7 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.commons.lang.mutable.MutableBoolean; +import org.apache.commons.lang3.mutable.MutableBoolean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java index 47b68e1..531d8c0 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java @@ -29,7 +29,7 @@ import static org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper.removeMetaD import java.io.IOException; import java.util.concurrent.CompletableFuture; -import org.apache.commons.lang.mutable.MutableInt; +import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.curator.framework.CuratorFramework; @@ -248,4 +248,4 @@ class ZKAsyncRegistry implements AsyncRegistry { public void close() { zk.close(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationSerDeHelper.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationSerDeHelper.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationSerDeHelper.java index 19c5042..b4de870 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationSerDeHelper.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationSerDeHelper.java @@ -18,7 +18,7 @@ */ package org.apache.hadoop.hbase.client.replication; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString; import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations; import org.apache.commons.logging.Log; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/TableCFs.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/TableCFs.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/TableCFs.java index 854517e..fc27deb 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/TableCFs.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/TableCFs.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client.replication; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClientConfigHelper.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClientConfigHelper.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClientConfigHelper.java index 726a9ef..9ebbc33 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClientConfigHelper.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClientConfigHelper.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Pair; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaSnapshot.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaSnapshot.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaSnapshot.java index 18fe76a..f691d7a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaSnapshot.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaSnapshot.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hbase.quotas; import java.util.Objects; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java index 1de3652..de35fc5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java @@ -35,7 +35,7 @@ import java.util.Map; import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java index 7753657..0925974 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.DoNotRetryIOException; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -461,7 +461,7 @@ public class TestClientNoCluster extends Configured implements Tool { @Override public MutateResponse mutate(RpcController controller, MutateRequest request) throws ServiceException { - throw new NotImplementedException(); + throw new NotImplementedException(HConstants.NOT_IMPLEMENTED); } @Override @@ -476,14 +476,14 @@ public class TestClientNoCluster extends Configured implements Tool { public BulkLoadHFileResponse bulkLoadHFile( RpcController controller, BulkLoadHFileRequest request) throws ServiceException { - throw new NotImplementedException(); + throw new NotImplementedException(HConstants.NOT_IMPLEMENTED); } @Override public CoprocessorServiceResponse execService( RpcController controller, CoprocessorServiceRequest request) throws ServiceException { - throw new NotImplementedException(); + throw new NotImplementedException(HConstants.NOT_IMPLEMENTED); } @Override @@ -505,19 +505,19 @@ public class TestClientNoCluster extends Configured implements Tool { @Override public CoprocessorServiceResponse execRegionServerService(RpcController controller, CoprocessorServiceRequest request) throws ServiceException { - throw new NotImplementedException(); + throw new NotImplementedException(HConstants.NOT_IMPLEMENTED); } @Override public PrepareBulkLoadResponse prepareBulkLoad(RpcController controller, PrepareBulkLoadRequest request) throws ServiceException { - throw new NotImplementedException(); + throw new NotImplementedException(HConstants.NOT_IMPLEMENTED); } @Override public CleanupBulkLoadResponse cleanupBulkLoad(RpcController controller, CleanupBulkLoadRequest request) throws ServiceException { - throw new NotImplementedException(); + throw new NotImplementedException(HConstants.NOT_IMPLEMENTED); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestCellBlockBuilder.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestCellBlockBuilder.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestCellBlockBuilder.java index 9addaa5..164bc85 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestCellBlockBuilder.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestCellBlockBuilder.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; -import org.apache.commons.lang.time.StopWatch; +import org.apache.commons.lang3.time.StopWatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.impl.Log4JLogger; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-common/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 21f60a3..f8244fa 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -233,8 +233,8 @@ compile - commons-lang - commons-lang + org.apache.commons + commons-lang3 compile http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index ecccca6..8ed3508 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.UUID; import java.util.regex.Pattern; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; @@ -1363,6 +1363,8 @@ public final class HConstants { public static final String DEFAULT_SNAPSHOT_RESTORE_FAILSAFE_NAME = "hbase-failsafe-{snapshot.name}-{restore.timestamp}"; + public static final String NOT_IMPLEMENTED = "Not implemented"; + private HConstants() { // Can't be instantiated with this ctor. } http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java index 5ec91f7..36be64e 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java @@ -25,7 +25,7 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import java.util.Iterator; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PairOfSameType.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PairOfSameType.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PairOfSameType.java index 3d520a8..387c670 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PairOfSameType.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PairOfSameType.java @@ -21,7 +21,8 @@ package org.apache.hadoop.hbase.util; import java.util.Iterator; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.classification.InterfaceAudience; /** @@ -106,7 +107,7 @@ public class PairOfSameType implements Iterable { @Override public void remove() { - throw new NotImplementedException(); + throw new NotImplementedException(HConstants.NOT_IMPLEMENTED); } }; } http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-hadoop2-compat/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index dd5b691..21a24e2 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -182,8 +182,8 @@ limitations under the License. ${hadoop-two.version} - commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-logging http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/HBaseMetrics2HadoopMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/HBaseMetrics2HadoopMetricsAdapter.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/HBaseMetrics2HadoopMetricsAdapter.java index ec4a1a7..3a24b94 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/HBaseMetrics2HadoopMetricsAdapter.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/HBaseMetrics2HadoopMetricsAdapter.java @@ -34,7 +34,7 @@ package org.apache.hadoop.hbase.metrics.impl; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.metrics.Counter; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java index 6a2f203..604377d 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java @@ -18,7 +18,7 @@ package org.apache.hadoop.metrics2.lib; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.Histogram; import org.apache.hadoop.hbase.metrics.Interns; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index af1e1d8..53a878e 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -271,8 +271,8 @@ commons-math - commons-lang - commons-lang + org.apache.commons + commons-lang3 org.apache.htrace http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java index 55c6e28..be25eaa 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java @@ -286,13 +286,13 @@ public class DistributedHBaseCluster extends HBaseCluster { @Override public void waitUntilShutDown() { // Simply wait for a few seconds for now (after issuing serverManager.kill - throw new RuntimeException("Not implemented yet"); + throw new RuntimeException(HConstants.NOT_IMPLEMENTED); } @Override public void shutdown() throws IOException { // not sure we want this - throw new RuntimeException("Not implemented yet"); + throw new RuntimeException(HConstants.NOT_IMPLEMENTED); } @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java index 0f48e4f..dbbcc44 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.Locale; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBase.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBase.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBase.java index 46f0490..2be1b2b 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBase.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBase.java @@ -24,7 +24,7 @@ import java.util.Properties; import java.util.Set; import org.apache.commons.cli.CommandLine; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java index e280453..d1a760b 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java @@ -25,8 +25,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -257,7 +257,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { return null; } ArrayList namespaceList = new ArrayList<>(namespaceMap.keySet()); - String randomKey = namespaceList.get(RandomUtils.nextInt(namespaceList.size())); + String randomKey = namespaceList.get(RandomUtils.nextInt(0, namespaceList.size())); NamespaceDescriptor randomNsd = namespaceMap.get(randomKey); // remove from namespaceMap namespaceMap.remove(randomKey); @@ -306,12 +306,12 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { private NamespaceDescriptor createNamespaceDesc() { String namespaceName = "itnamespace" + String.format("%010d", - RandomUtils.nextInt(Integer.MAX_VALUE)); + RandomUtils.nextInt()); NamespaceDescriptor nsd = NamespaceDescriptor.create(namespaceName).build(); nsd.setConfiguration( nsTestConfigKey, - String.format("%010d", RandomUtils.nextInt(Integer.MAX_VALUE))); + String.format("%010d", RandomUtils.nextInt())); return nsd; } } @@ -331,7 +331,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { NamespaceDescriptor modifiedNsd = NamespaceDescriptor.create(namespaceName).build(); String nsValueNew; do { - nsValueNew = String.format("%010d", RandomUtils.nextInt(Integer.MAX_VALUE)); + nsValueNew = String.format("%010d", RandomUtils.nextInt()); } while (selected.getConfigurationValue(nsTestConfigKey).equals(nsValueNew)); modifiedNsd.setConfiguration(nsTestConfigKey, nsValueNew); admin.modifyNamespace(modifiedNsd); @@ -397,7 +397,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { return null; } ArrayList tableList = new ArrayList<>(tableMap.keySet()); - TableName randomKey = tableList.get(RandomUtils.nextInt(tableList.size())); + TableName randomKey = tableList.get(RandomUtils.nextInt(0, tableList.size())); TableDescriptor randomTd = tableMap.remove(randomKey); return randomTd; } @@ -436,7 +436,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { } private TableDescriptor createTableDesc() { - String tableName = String.format("ittable-%010d", RandomUtils.nextInt(Integer.MAX_VALUE)); + String tableName = String.format("ittable-%010d", RandomUtils.nextInt()); String familyName = "cf-" + Math.abs(RandomUtils.nextInt()); return TableDescriptorBuilder.newBuilder(TableName.valueOf(tableName)) .addColumnFamily(ColumnFamilyDescriptorBuilder.of(familyName)) @@ -581,7 +581,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { LOG.info("No column families in table: " + td); return null; } - ColumnFamilyDescriptor randomCfd = families[RandomUtils.nextInt(families.length)]; + ColumnFamilyDescriptor randomCfd = families[RandomUtils.nextInt(0, families.length)]; return randomCfd; } } @@ -624,7 +624,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { } private ColumnFamilyDescriptor createFamilyDesc() { - String familyName = String.format("cf-%010d", RandomUtils.nextInt(Integer.MAX_VALUE)); + String familyName = String.format("cf-%010d", RandomUtils.nextInt()); return ColumnFamilyDescriptorBuilder.of(familyName); } } @@ -643,7 +643,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { } Admin admin = connection.getAdmin(); - int versions = RandomUtils.nextInt(10) + 3; + int versions = RandomUtils.nextInt(0, 10) + 3; try { TableName tableName = selected.getTableName(); LOG.info("Altering versions of column family: " + columnDesc + " to: " + versions + @@ -698,7 +698,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { TableName tableName = selected.getTableName(); // possible DataBlockEncoding ids int[] possibleIds = {0, 2, 3, 4, 6}; - short id = (short) possibleIds[RandomUtils.nextInt(possibleIds.length)]; + short id = (short) possibleIds[RandomUtils.nextInt(0, possibleIds.length)]; LOG.info("Altering encoding of column family: " + columnDesc + " to: " + id + " in table: " + tableName); @@ -789,13 +789,13 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { for (int i = 0; i < numRows; i++){ // nextInt(Integer.MAX_VALUE)) to return positive numbers only byte[] rowKey = Bytes.toBytes( - "row-" + String.format("%010d", RandomUtils.nextInt(Integer.MAX_VALUE))); + "row-" + String.format("%010d", RandomUtils.nextInt())); ColumnFamilyDescriptor cfd = selectFamily(selected); if (cfd == null){ return; } byte[] family = cfd.getName(); - byte[] qualifier = Bytes.toBytes("col-" + RandomUtils.nextInt(Integer.MAX_VALUE) % 10); + byte[] qualifier = Bytes.toBytes("col-" + RandomUtils.nextInt() % 10); byte[] value = Bytes.toBytes("val-" + RandomStringUtils.randomAlphanumeric(10)); Put put = new Put(rowKey); put.addColumn(family, qualifier, value); @@ -873,7 +873,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { break; case DELETE_TABLE: // reduce probability of deleting table to 20% - if (RandomUtils.nextInt(100) < 20) { + if (RandomUtils.nextInt(0, 100) < 20) { new DeleteTableAction().perform(); } break; @@ -882,7 +882,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { break; case DELETE_COLUMNFAMILY: // reduce probability of deleting column family to 20% - if (RandomUtils.nextInt(100) < 20) { + if (RandomUtils.nextInt(0, 100) < 20) { new DeleteColumnFamilyAction().perform(); } break; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java index d129279..3865209 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.List; import org.apache.commons.cli.CommandLine; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.security.User; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java index 2f10989..3d631eb 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java @@ -23,7 +23,7 @@ import java.util.Locale; import java.util.Set; import org.apache.commons.cli.CommandLine; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java ---------------------------------------------------------------------- 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 5ec9cdb..2f01afe 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 @@ -26,7 +26,7 @@ import java.util.List; import java.util.function.BiConsumer; import java.util.function.Consumer; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -208,7 +208,7 @@ public class Action { int victimRegionCount = (int)Math.ceil(fractionOfRegions * regions.size()); LOG.debug("Removing " + victimRegionCount + " regions from " + server.getServerName()); for (int i = 0; i < victimRegionCount; ++i) { - int victimIx = RandomUtils.nextInt(regions.size()); + int victimIx = RandomUtils.nextInt(0, regions.size()); String regionId = HRegionInfo.encodeRegionName(regions.remove(victimIx)); victimRegions.add(Bytes.toBytes(regionId)); } @@ -223,7 +223,7 @@ public class Action { if (context.isStopping()) { break; } - int targetIx = RandomUtils.nextInt(toServers.size()); + int targetIx = RandomUtils.nextInt(0, toServers.size()); admin.move(victimRegion, Bytes.toBytes(toServers.get(targetIx).getServerName())); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/AddColumnAction.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/AddColumnAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/AddColumnAction.java index f382747..0ef8cfd 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/AddColumnAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/AddColumnAction.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.chaos.actions; import java.io.IOException; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactMobAction.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactMobAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactMobAction.java index bbb86a1..7e812a8 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactMobAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactMobAction.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hbase.chaos.actions; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; @@ -47,7 +47,7 @@ public class CompactMobAction extends Action { public void perform() throws Exception { HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility(); Admin admin = util.getAdmin(); - boolean major = RandomUtils.nextInt(100) < majorRatio; + boolean major = RandomUtils.nextInt(0, 100) < majorRatio; // Don't try the modify if we're stopping if (context.isStopping()) { http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactRandomRegionOfTableAction.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactRandomRegionOfTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactRandomRegionOfTableAction.java index 046415f..f3fe6ff 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactRandomRegionOfTableAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactRandomRegionOfTableAction.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.chaos.actions; import java.util.List; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.TableName; @@ -51,7 +51,7 @@ public class CompactRandomRegionOfTableAction extends Action { public void perform() throws Exception { HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility(); Admin admin = util.getAdmin(); - boolean major = RandomUtils.nextInt(100) < majorRatio; + boolean major = RandomUtils.nextInt(0, 100) < majorRatio; LOG.info("Performing action: Compact random region of table " + tableName + ", major=" + major); http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactTableAction.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactTableAction.java index 3eab335..521591c 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactTableAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactTableAction.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hbase.chaos.actions; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; @@ -46,7 +46,7 @@ public class CompactTableAction extends Action { public void perform() throws Exception { HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility(); Admin admin = util.getAdmin(); - boolean major = RandomUtils.nextInt(100) < majorRatio; + boolean major = RandomUtils.nextInt(0, 100) < majorRatio; LOG.info("Performing action: Compact table " + tableName + ", major=" + major); try { http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MergeRandomAdjacentRegionsOfTableAction.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MergeRandomAdjacentRegionsOfTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MergeRandomAdjacentRegionsOfTableAction.java index aa796ab..686e622 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MergeRandomAdjacentRegionsOfTableAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MergeRandomAdjacentRegionsOfTableAction.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.chaos.actions; import java.util.List; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.TableName; @@ -54,7 +54,7 @@ public class MergeRandomAdjacentRegionsOfTableAction extends Action { return; } - int i = RandomUtils.nextInt(regions.size() - 1); + int i = RandomUtils.nextInt(0, regions.size() - 1); HRegionInfo a = regions.get(i++); HRegionInfo b = regions.get(i); LOG.debug("Merging " + a.getRegionNameAsString() + " and " + b.getRegionNameAsString()); http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java index 146c63c..c3793d0 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; @@ -77,7 +77,7 @@ public class MoveRegionsOfTableAction extends Action { try { String destServerName = - servers[RandomUtils.nextInt(servers.length)].getServerName(); + servers[RandomUtils.nextInt(0, servers.length)].getServerName(); LOG.debug("Moving " + regionInfo.getRegionNameAsString() + " to " + destServerName); admin.move(regionInfo.getEncodedNameAsBytes(), Bytes.toBytes(destServerName)); } catch (Exception ex) { http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingTableAction.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingTableAction.java index 6eab85c..2c9a872 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingTableAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingTableAction.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.chaos.actions; import java.util.List; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.client.RegionLocator; @@ -41,6 +41,6 @@ public class RestartRsHoldingTableAction extends RestartActionBaseAction { LOG.info("Performing action: Restart random RS holding table " + this.locator.getName()); List locations = locator.getAllRegionLocations(); - restartRs(locations.get(RandomUtils.nextInt(locations.size())).getServerName(), sleepTime); + restartRs(locations.get(RandomUtils.nextInt(0, locations.size())).getServerName(), sleepTime); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java ---------------------------------------------------------------------- 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 ba25198..800a445 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 @@ -24,7 +24,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.ServerName; @@ -104,7 +104,7 @@ public class RollingBatchRestartRsAction extends BatchRestartRsAction { break; } - sleep(RandomUtils.nextInt((int)sleepTime)); + sleep(RandomUtils.nextInt(0, (int)sleepTime)); } } @@ -149,4 +149,4 @@ public class RollingBatchRestartRsAction extends BatchRestartRsAction { action.perform(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/UnbalanceKillAndRebalanceAction.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/UnbalanceKillAndRebalanceAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/UnbalanceKillAndRebalanceAction.java index 626953d..7b6f292 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/UnbalanceKillAndRebalanceAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/UnbalanceKillAndRebalanceAction.java @@ -24,7 +24,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.ServerName; import org.junit.Assert; @@ -65,7 +65,7 @@ public class UnbalanceKillAndRebalanceAction extends Action { liveCount + deadCount < victimServers.size()); List targetServers = new ArrayList<>(liveCount); for (int i = 0; i < liveCount + deadCount; ++i) { - int victimIx = RandomUtils.nextInt(victimServers.size()); + int victimIx = RandomUtils.nextInt(0, victimServers.size()); targetServers.add(victimServers.remove(victimIx)); } unbalanceRegions(status, victimServers, targetServers, HOARD_FRC_OF_REGIONS); http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/UnbalanceRegionsAction.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/UnbalanceRegionsAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/UnbalanceRegionsAction.java index bdffdb1..e5faf08 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/UnbalanceRegionsAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/UnbalanceRegionsAction.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.ServerName; @@ -52,7 +52,7 @@ public class UnbalanceRegionsAction extends Action { int targetServerCount = (int)Math.ceil(fractionOfServers * victimServers.size()); List targetServers = new ArrayList<>(targetServerCount); for (int i = 0; i < targetServerCount; ++i) { - int victimIx = RandomUtils.nextInt(victimServers.size()); + int victimIx = RandomUtils.nextInt(0, victimServers.size()); targetServers.add(victimServers.remove(victimIx)); } unbalanceRegions(status, victimServers, targetServers, fractionOfRegions); http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/monkies/PolicyBasedChaosMonkey.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/monkies/PolicyBasedChaosMonkey.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/monkies/PolicyBasedChaosMonkey.java index 951f8f8..70452bb 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/monkies/PolicyBasedChaosMonkey.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/monkies/PolicyBasedChaosMonkey.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.IntegrationTestingUtility; @@ -61,7 +61,7 @@ public class PolicyBasedChaosMonkey extends ChaosMonkey { /** Selects a random item from the given items */ public static T selectRandomItem(T[] items) { - return items[RandomUtils.nextInt(items.length)]; + return items[RandomUtils.nextInt(0, items.length)]; } /** Selects a random item from the given items with weights*/ @@ -71,7 +71,7 @@ public class PolicyBasedChaosMonkey extends ChaosMonkey { totalWeight += pair.getSecond(); } - int cutoff = RandomUtils.nextInt(totalWeight); + int cutoff = RandomUtils.nextInt(0, totalWeight); int cummulative = 0; T item = null; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/PeriodicPolicy.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/PeriodicPolicy.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/PeriodicPolicy.java index b7b6109..3b6908d 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/PeriodicPolicy.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/PeriodicPolicy.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hbase.chaos.policies; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hbase.util.Threads; /** A policy which does stuff every time interval. */ @@ -32,7 +32,7 @@ public abstract class PeriodicPolicy extends Policy { @Override public void run() { // Add some jitter. - int jitter = RandomUtils.nextInt((int) periodMs); + int jitter = RandomUtils.nextInt(0, (int) periodMs); LOG.info("Sleeping for " + jitter + " to add jitter"); Threads.sleep(jitter); http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java index f142321..5911085 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java @@ -22,7 +22,7 @@ import java.util.Properties; import java.util.Set; import org.apache.commons.cli.CommandLine; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java index cd84163..6371dae 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java @@ -31,7 +31,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.cli.CommandLine; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java index 272af96..97a06f4 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java @@ -29,7 +29,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.math.stat.descriptive.DescriptiveStatistics; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java index 5bd2c87..7337423 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java @@ -26,7 +26,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 37ca16c..f933f90 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -284,8 +284,8 @@ commons-io - commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-logging http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java index 7fea254..ca6b1e9 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java @@ -34,7 +34,7 @@ import java.util.UUID; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java index b64271e..44b856c 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/RowCounter.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/RowCounter.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/RowCounter.java index 2e0591e..6aedc56 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/RowCounter.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/RowCounter.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java index 23a70a9..6b058b0 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java @@ -43,7 +43,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-metrics-api/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-metrics-api/pom.xml b/hbase-metrics-api/pom.xml index 5e9f3ed..38bd772 100644 --- a/hbase-metrics-api/pom.xml +++ b/hbase-metrics-api/pom.xml @@ -93,8 +93,8 @@ commons-logging - commons-lang - commons-lang + org.apache.commons + commons-lang3 org.apache.hbase.thirdparty http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-metrics-api/src/main/java/org/apache/hadoop/hbase/metrics/MetricRegistryInfo.java ---------------------------------------------------------------------- diff --git a/hbase-metrics-api/src/main/java/org/apache/hadoop/hbase/metrics/MetricRegistryInfo.java b/hbase-metrics-api/src/main/java/org/apache/hadoop/hbase/metrics/MetricRegistryInfo.java index 88ba232..7da2c19 100644 --- a/hbase-metrics-api/src/main/java/org/apache/hadoop/hbase/metrics/MetricRegistryInfo.java +++ b/hbase-metrics-api/src/main/java/org/apache/hadoop/hbase/metrics/MetricRegistryInfo.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.metrics; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.hadoop.hbase.classification.InterfaceAudience; /** http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-replication/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-replication/pom.xml b/hbase-replication/pom.xml index 5c46dff..b53c87c 100644 --- a/hbase-replication/pom.xml +++ b/hbase-replication/pom.xml @@ -130,8 +130,8 @@ - commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-logging http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationFactory.java ---------------------------------------------------------------------- diff --git a/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationFactory.java b/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationFactory.java index 8506cbb..05757b9 100644 --- a/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationFactory.java +++ b/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationFactory.java @@ -18,7 +18,7 @@ */ package org.apache.hadoop.hbase.replication; -import org.apache.commons.lang.reflect.ConstructorUtils; +import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; http://git-wip-us.apache.org/repos/asf/hbase/blob/bd219c0f/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesClientImpl.java ---------------------------------------------------------------------- diff --git a/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesClientImpl.java b/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesClientImpl.java index 3507547..a16b368 100644 --- a/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesClientImpl.java +++ b/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesClientImpl.java @@ -18,9 +18,10 @@ */ package org.apache.hadoop.hbase.replication; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; @@ -95,18 +96,18 @@ public class TableBasedReplicationQueuesClientImpl extends ReplicationTableBase @Override public int getHFileRefsNodeChangeVersion() throws KeeperException { // TODO - throw new NotImplementedException(); + throw new NotImplementedException(HConstants.NOT_IMPLEMENTED); } @Override public List getAllPeersFromHFileRefsQueue() throws KeeperException { // TODO - throw new NotImplementedException(); + throw new NotImplementedException(HConstants.NOT_IMPLEMENTED); } @Override public List getReplicableHFiles(String peerId) throws KeeperException { // TODO - throw new NotImplementedException(); + throw new NotImplementedException(HConstants.NOT_IMPLEMENTED); } }