HBASE-25477 Purge use of VisibleForTesting (#19)
Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
diff --git a/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/HBaseObjectStoreSemantics.java b/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/HBaseObjectStoreSemantics.java
index 73b71e9..d1fcc1c 100644
--- a/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/HBaseObjectStoreSemantics.java
+++ b/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/HBaseObjectStoreSemantics.java
@@ -56,7 +56,6 @@
import org.apache.hadoop.hbase.oss.sync.TreeLockManager.Depth;
import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.util.Progressable;
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
import org.slf4j.Logger;
@@ -119,7 +118,7 @@
sync = TreeLockManager.get(fs);
}
- @VisibleForTesting
+ @InterfaceAudience.Private
TreeLockManager getLockManager() {
return sync;
}
diff --git a/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/TreeLockManager.java b/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/TreeLockManager.java
index d6ae05c..22209e4 100644
--- a/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/TreeLockManager.java
+++ b/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/TreeLockManager.java
@@ -30,7 +30,6 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.oss.Constants;
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
import org.slf4j.Logger;
@@ -109,7 +108,7 @@
* Convenience function for calling norm on an array. Returned copy of the
* array will also be sorted for deadlock avoidance.
*/
- @VisibleForTesting
+ @InterfaceAudience.Private
private Path[] norm(Path[] paths) {
Path[] newPaths = new Path[paths.length];
for (int i = 0; i < paths.length; i++) {
@@ -204,7 +203,7 @@
* @return True if a lock is found, false otherwise
* @throws IOException at any possible IO failure.
*/
- @VisibleForTesting
+ @InterfaceAudience.Private
public abstract boolean writeLockBelow(Path p, Depth depth) throws IOException;
/**
@@ -217,7 +216,7 @@
* @return True if a lock is found, false otherwise
* @throws IOException at any possible IO failure.
*/
- @VisibleForTesting
+ @InterfaceAudience.Private
public abstract boolean readLockBelow(Path p, Depth depth) throws IOException;
/**
diff --git a/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/ZKTreeLockManager.java b/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/ZKTreeLockManager.java
index 9ca4811..0b8f819 100644
--- a/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/ZKTreeLockManager.java
+++ b/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/ZKTreeLockManager.java
@@ -38,7 +38,6 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.oss.Constants;
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
import org.apache.zookeeper.KeeperException;
@@ -210,7 +209,7 @@
}
@Override
- @VisibleForTesting
+ @InterfaceAudience.Private
public boolean writeLockBelow(Path p, Depth depth) throws IOException {
int maxLevel = (depth == Depth.DIRECTORY) ? 1 : Integer.MAX_VALUE;
boolean b = writeLockBelow(p, 0, maxLevel);
@@ -218,7 +217,7 @@
}
@Override
- @VisibleForTesting
+ @InterfaceAudience.Private
public boolean readLockBelow(Path p, Depth depth) throws IOException {
int maxLevel = (depth == Depth.DIRECTORY) ? 1 : Integer.MAX_VALUE;
boolean b = readLockBelow(p, 0, maxLevel);
diff --git a/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/LocalTreeLockManager.java b/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/LocalTreeLockManager.java
index 4d4a8e2..d7f5eb0 100644
--- a/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/LocalTreeLockManager.java
+++ b/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/LocalTreeLockManager.java
@@ -24,7 +24,7 @@
import java.util.Set;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -98,7 +98,7 @@
}
@Override
- @VisibleForTesting
+ @InterfaceAudience.Private
public boolean writeLockBelow(Path p, Depth depth) {
createLocksIfNeeded(p);
int maxLevel = (depth == Depth.DIRECTORY) ? 1 : Integer.MAX_VALUE;
@@ -106,7 +106,7 @@
}
@Override
- @VisibleForTesting
+ @InterfaceAudience.Private
public boolean readLockBelow(Path p, Depth depth) {
createLocksIfNeeded(p);
int maxLevel = (depth == Depth.DIRECTORY) ? 1 : Integer.MAX_VALUE;
diff --git a/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/NullTreeLockManager.java b/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/NullTreeLockManager.java
index 1027988..f9c67ca 100644
--- a/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/NullTreeLockManager.java
+++ b/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/NullTreeLockManager.java
@@ -20,7 +20,7 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Bypasses all synchronization to effectively make HBOSS operations no-ops.
@@ -56,13 +56,13 @@
}
@Override
- @VisibleForTesting
+ @InterfaceAudience.Private
public boolean writeLockBelow(Path p, Depth depth) {
return false;
}
@Override
- @VisibleForTesting
+ @InterfaceAudience.Private
public boolean readLockBelow(Path p, Depth depth) {
return false;
}
diff --git a/pom.xml b/pom.xml
index 773514e..ee89be5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,12 +171,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-miscellaneous</artifactId>
- <version>${hbase-thirdparty.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
</profile>
<profile>
