Skip to content

Commit 01f93b1

Browse files
committed
HBASE-26081 Copy HBTU to hbase-testing-util, rename the HBTU related classes in hbase-server and mark them as IA.LimitedPrivate
1 parent 0836695 commit 01f93b1

File tree

933 files changed

+7778
-1088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

933 files changed

+7778
-1088
lines changed

hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121

2222
import java.io.IOException;
2323
import org.apache.hadoop.hbase.HBaseClassTestRule;
24-
import org.apache.hadoop.hbase.HBaseTestingUtility;
2524
import org.apache.hadoop.hbase.NamespaceDescriptor;
2625
import org.apache.hadoop.hbase.client.Admin;
2726
import org.apache.hadoop.hbase.client.Get;
2827
import org.apache.hadoop.hbase.client.Put;
2928
import org.apache.hadoop.hbase.client.Result;
3029
import org.apache.hadoop.hbase.client.Table;
3130
import org.apache.hadoop.hbase.testclassification.MediumTests;
31+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
3232
import org.apache.hadoop.hbase.util.Bytes;
3333
import org.junit.AfterClass;
3434
import org.junit.BeforeClass;

hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121

2222
import java.io.IOException;
2323
import org.apache.hadoop.hbase.HBaseClassTestRule;
24-
import org.apache.hadoop.hbase.HBaseTestingUtility;
2524
import org.apache.hadoop.hbase.NamespaceDescriptor;
2625
import org.apache.hadoop.hbase.client.Admin;
2726
import org.apache.hadoop.hbase.client.Get;
2827
import org.apache.hadoop.hbase.client.Put;
2928
import org.apache.hadoop.hbase.client.Result;
3029
import org.apache.hadoop.hbase.client.Table;
3130
import org.apache.hadoop.hbase.testclassification.MediumTests;
31+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
3232
import org.apache.hadoop.hbase.util.Bytes;
3333
import org.junit.AfterClass;
3434
import org.junit.BeforeClass;

hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.io.IOException;
2222
import org.apache.hadoop.conf.Configuration;
2323
import org.apache.hadoop.fs.Path;
24-
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
24+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
2525
import org.apache.hadoop.hdfs.MiniDFSCluster;
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;

hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.apache.hadoop.fs.FileSystem;
2323
import org.apache.hadoop.fs.Path;
2424
import org.apache.hadoop.hbase.HBaseClassTestRule;
25-
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
2625
import org.apache.hadoop.hbase.testclassification.MiscTests;
2726
import org.apache.hadoop.hbase.testclassification.SmallTests;
27+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
2828
import org.apache.hadoop.hbase.util.CommonFSUtils;
2929
import org.junit.AfterClass;
3030
import org.junit.ClassRule;

hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import org.apache.hadoop.conf.Configuration;
2424
import org.apache.hadoop.fs.CommonConfigurationKeys;
2525
import org.apache.hadoop.hbase.AuthUtil;
26-
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
2726
import org.apache.hadoop.hbase.HBaseConfiguration;
2827
import org.apache.hadoop.hbase.http.ssl.KeyStoreTestUtil;
28+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
2929
import org.apache.hadoop.hdfs.DFSConfigKeys;
3030
import org.apache.hadoop.http.HttpConfig;
3131
import org.apache.hadoop.security.UserGroupInformation;

hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/util/TestRecoverLeaseFSUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.apache.hadoop.conf.Configuration;
2525
import org.apache.hadoop.fs.Path;
2626
import org.apache.hadoop.hbase.HBaseClassTestRule;
27-
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
2827
import org.apache.hadoop.hbase.testclassification.MediumTests;
2928
import org.apache.hadoop.hbase.testclassification.MiscTests;
29+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
3030
import org.apache.hadoop.hdfs.DistributedFileSystem;
3131
import org.junit.ClassRule;
3232
import org.junit.Test;

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.apache.hadoop.fs.Path;
3333
import org.apache.hadoop.fs.RemoteIterator;
3434
import org.apache.hadoop.hbase.HBaseConfiguration;
35-
import org.apache.hadoop.hbase.HBaseTestingUtility;
3635
import org.apache.hadoop.hbase.HConstants;
3736
import org.apache.hadoop.hbase.NamespaceDescriptor;
3837
import org.apache.hadoop.hbase.TableName;
@@ -61,6 +60,7 @@
6160
import org.apache.hadoop.hbase.security.UserProvider;
6261
import org.apache.hadoop.hbase.security.access.SecureTestUtil;
6362
import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;
63+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
6464
import org.apache.hadoop.hbase.util.Bytes;
6565
import org.apache.hadoop.hbase.util.CommonFSUtils;
6666
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.hadoop.fs.FileSystem;
2828
import org.apache.hadoop.fs.Path;
2929
import org.apache.hadoop.hbase.HBaseClassTestRule;
30-
import org.apache.hadoop.hbase.HBaseTestingUtility;
3130
import org.apache.hadoop.hbase.HConstants;
3231
import org.apache.hadoop.hbase.TableName;
3332
import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
@@ -41,6 +40,7 @@
4140
import org.apache.hadoop.hbase.coprocessor.MasterObserver;
4241
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
4342
import org.apache.hadoop.hbase.testclassification.LargeTests;
43+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
4444
import org.apache.hadoop.util.ToolRunner;
4545
import org.junit.BeforeClass;
4646
import org.junit.ClassRule;

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
import org.apache.hadoop.fs.FileSystem;
3131
import org.apache.hadoop.fs.Path;
3232
import org.apache.hadoop.hbase.HBaseClassTestRule;
33-
import org.apache.hadoop.hbase.HBaseTestingUtility;
3433
import org.apache.hadoop.hbase.TableName;
3534
import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
3635
import org.apache.hadoop.hbase.client.Connection;
3736
import org.apache.hadoop.hbase.client.ConnectionFactory;
3837
import org.apache.hadoop.hbase.testclassification.MasterTests;
3938
import org.apache.hadoop.hbase.testclassification.SmallTests;
39+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
4040
import org.apache.hadoop.hbase.util.Bytes;
4141
import org.junit.After;
4242
import org.junit.AfterClass;

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
import org.apache.hadoop.conf.Configuration;
2828
import org.apache.hadoop.hbase.HBaseClassTestRule;
29-
import org.apache.hadoop.hbase.HBaseTestingUtility;
30-
import org.apache.hadoop.hbase.MiniHBaseCluster;
3129
import org.apache.hadoop.hbase.backup.impl.BackupManager;
3230
import org.apache.hadoop.hbase.client.Connection;
3331
import org.apache.hadoop.hbase.testclassification.MediumTests;
32+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
33+
import org.apache.hadoop.hbase.testing.MiniHBaseCluster;
3434
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
3535
import org.junit.After;
3636
import org.junit.AfterClass;

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
import org.apache.hadoop.fs.FileStatus;
3939
import org.apache.hadoop.fs.Path;
4040
import org.apache.hadoop.hbase.HBaseClassTestRule;
41-
import org.apache.hadoop.hbase.HBaseTestingUtility;
42-
import org.apache.hadoop.hbase.MiniHBaseCluster;
4341
import org.apache.hadoop.hbase.TableName;
4442
import org.apache.hadoop.hbase.backup.BackupInfo.BackupState;
4543
import org.apache.hadoop.hbase.backup.impl.BackupManager;
4644
import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
4745
import org.apache.hadoop.hbase.client.Admin;
4846
import org.apache.hadoop.hbase.client.Connection;
4947
import org.apache.hadoop.hbase.testclassification.MediumTests;
48+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
49+
import org.apache.hadoop.hbase.testing.MiniHBaseCluster;
5050
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
5151
import org.junit.After;
5252
import org.junit.AfterClass;

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.apache.hadoop.fs.FileSystem;
2525
import org.apache.hadoop.fs.Path;
2626
import org.apache.hadoop.hbase.HBaseClassTestRule;
27-
import org.apache.hadoop.hbase.HBaseTestingUtility;
2827
import org.apache.hadoop.hbase.backup.util.BackupUtils;
2928
import org.apache.hadoop.hbase.testclassification.SmallTests;
29+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
3030
import org.apache.hadoop.security.UserGroupInformation;
3131
import org.junit.Assert;
3232
import org.junit.ClassRule;

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import java.util.Collection;
2424
import java.util.List;
2525
import org.apache.hadoop.hbase.HBaseClassTestRule;
26-
import org.apache.hadoop.hbase.HBaseTestingUtility;
27-
import org.apache.hadoop.hbase.MiniHBaseCluster;
2826
import org.apache.hadoop.hbase.TableName;
2927
import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl;
3028
import org.apache.hadoop.hbase.backup.util.BackupUtils;
@@ -38,6 +36,8 @@
3836
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
3937
import org.apache.hadoop.hbase.regionserver.HRegion;
4038
import org.apache.hadoop.hbase.testclassification.LargeTests;
39+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
40+
import org.apache.hadoop.hbase.testing.MiniHBaseCluster;
4141
import org.apache.hadoop.hbase.util.Bytes;
4242
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
4343
import org.junit.Assert;

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.io.IOException;
2323
import java.util.concurrent.CountDownLatch;
2424
import org.apache.hadoop.hbase.HBaseClassTestRule;
25-
import org.apache.hadoop.hbase.HBaseTestingUtility;
2625
import org.apache.hadoop.hbase.HConstants;
2726
import org.apache.hadoop.hbase.TableName;
2827
import org.apache.hadoop.hbase.backup.util.BackupUtils;
@@ -37,6 +36,7 @@
3736
import org.apache.hadoop.hbase.snapshot.MobSnapshotTestingUtils;
3837
import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;
3938
import org.apache.hadoop.hbase.testclassification.LargeTests;
39+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
4040
import org.apache.hadoop.hbase.util.Bytes;
4141
import org.junit.Assert;
4242
import org.junit.BeforeClass;

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import static org.junit.Assert.assertTrue;
2121

2222
import org.apache.hadoop.hbase.HBaseClassTestRule;
23-
import org.apache.hadoop.hbase.HBaseTestingUtility;
2423
import org.apache.hadoop.hbase.TableName;
2524
import org.apache.hadoop.hbase.backup.util.BackupUtils;
2625
import org.apache.hadoop.hbase.client.Admin;
2726
import org.apache.hadoop.hbase.testclassification.LargeTests;
27+
import org.apache.hadoop.hbase.testing.HBaseTestingUtility;
2828
import org.junit.BeforeClass;
2929
import org.junit.ClassRule;
3030
import org.junit.Test;

hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerPerformanceEvaluation.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@
2525
import java.util.List;
2626
import java.util.Map;
2727
import java.util.concurrent.TimeUnit;
28-
29-
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
3028
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
3129
import org.apache.hadoop.hbase.HConstants;
3230
import org.apache.hadoop.hbase.ServerName;
3331
import org.apache.hadoop.hbase.TableName;
3432
import org.apache.hadoop.hbase.client.RegionInfo;
3533
import org.apache.hadoop.hbase.client.RegionInfoBuilder;
3634
import org.apache.hadoop.hbase.master.LoadBalancer;
35+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
3736
import org.apache.hadoop.hbase.util.AbstractHBaseTool;
3837
import org.apache.hadoop.hbase.util.Bytes;
3938
import org.apache.yetus.audience.InterfaceAudience;

hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCost.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.util.concurrent.ThreadLocalRandom;
3636
import org.apache.hadoop.fs.FileSystem;
3737
import org.apache.hadoop.hbase.HBaseClassTestRule;
38-
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
3938
import org.apache.hadoop.hbase.HConstants;
4039
import org.apache.hadoop.hbase.ServerName;
4140
import org.apache.hadoop.hbase.client.RegionInfo;
@@ -44,6 +43,7 @@
4443
import org.apache.hadoop.hbase.master.RegionPlan;
4544
import org.apache.hadoop.hbase.testclassification.MasterTests;
4645
import org.apache.hadoop.hbase.testclassification.MediumTests;
46+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
4747
import org.junit.BeforeClass;
4848
import org.junit.ClassRule;
4949
import org.junit.Test;

hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCostRules.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import java.util.Arrays;
2727
import java.util.Collections;
2828
import org.apache.hadoop.hbase.HBaseClassTestRule;
29-
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
3029
import org.apache.hadoop.hbase.testclassification.MasterTests;
3130
import org.apache.hadoop.hbase.testclassification.MediumTests;
31+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
3232
import org.junit.Before;
3333
import org.junit.BeforeClass;
3434
import org.junit.ClassRule;

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMasterRegistryHedgedReads.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
import java.util.stream.IntStream;
3333
import org.apache.hadoop.conf.Configuration;
3434
import org.apache.hadoop.hbase.HBaseClassTestRule;
35-
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
3635
import org.apache.hadoop.hbase.HConstants;
3736
import org.apache.hadoop.hbase.ServerName;
3837
import org.apache.hadoop.hbase.ipc.RpcClient;
3938
import org.apache.hadoop.hbase.ipc.RpcClientFactory;
4039
import org.apache.hadoop.hbase.security.User;
4140
import org.apache.hadoop.hbase.testclassification.ClientTests;
4241
import org.apache.hadoop.hbase.testclassification.SmallTests;
42+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
4343
import org.apache.hadoop.hbase.util.FutureUtils;
4444
import org.junit.AfterClass;
4545
import org.junit.Before;

hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import org.apache.hadoop.hbase.ByteBufferKeyValue;
2626
import org.apache.hadoop.hbase.CellUtil;
2727
import org.apache.hadoop.hbase.HBaseClassTestRule;
28-
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
2928
import org.apache.hadoop.hbase.KeyValue;
3029
import org.apache.hadoop.hbase.KeyValue.Type;
3130
import org.apache.hadoop.hbase.KeyValueUtil;
3231
import org.apache.hadoop.hbase.filter.KeyOnlyFilter.KeyOnlyByteBufferExtendedCell;
3332
import org.apache.hadoop.hbase.filter.KeyOnlyFilter.KeyOnlyCell;
3433
import org.apache.hadoop.hbase.testclassification.MiscTests;
3534
import org.apache.hadoop.hbase.testclassification.SmallTests;
35+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
3636
import org.apache.hadoop.hbase.util.Bytes;
3737
import org.junit.ClassRule;
3838
import org.junit.Test;

hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import javax.tools.ToolProvider;
4242
import org.apache.hadoop.hbase.testclassification.MiscTests;
4343
import org.apache.hadoop.hbase.testclassification.SmallTests;
44+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
4445
import org.junit.AfterClass;
4546
import org.junit.BeforeClass;
4647
import org.junit.ClassRule;

hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.apache.hadoop.hbase.security.User;
3131
import org.apache.hadoop.hbase.testclassification.MiscTests;
3232
import org.apache.hadoop.hbase.testclassification.SmallTests;
33+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
3334
import org.junit.AfterClass;
3435
import org.junit.Assert;
3536
import org.junit.ClassRule;

hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import java.util.Properties;
3030
import javax.crypto.spec.SecretKeySpec;
3131
import org.apache.hadoop.hbase.HBaseClassTestRule;
32-
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
3332
import org.apache.hadoop.hbase.testclassification.MiscTests;
3433
import org.apache.hadoop.hbase.testclassification.SmallTests;
34+
import org.apache.hadoop.hbase.testing.HBaseCommonTestingUtility;
3535
import org.apache.hadoop.hbase.util.Bytes;
3636
import org.junit.BeforeClass;
3737
import org.junit.ClassRule;

0 commit comments

Comments
 (0)