fix tests

apache · Jul 6, 2024 · 36ba5ca · 36ba5ca
1 parent 9b3c880
commit 36ba5ca
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 410 deletions.
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
@@ -172,7 +172,7 @@ public Delete addFamily(final byte[] family) {
    * @return this for invocation chaining
    */
   public Delete addFamily(final byte[] family, final long timestamp) {
-    checkTimestamp(ts);
+    checkTimestamp(timestamp);
     List<ExtendedCell> list = getCellList(family);
     if (!list.isEmpty()) {
       list.clear();

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java
@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
-import java.util.Objects;
 import java.util.TreeMap;
 import java.util.UUID;
 import org.apache.hadoop.hbase.Cell;
@@ -37,6 +36,8 @@
 import org.apache.hadoop.hbase.util.ClassSize;
 import org.apache.yetus.audience.InterfaceAudience;
 
+import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
+
 /**
  * Used to perform Increment operations on a single row.
  * <p>
@@ -116,7 +117,7 @@ public Increment add(Cell cell) throws IOException {
    * @return the Increment object
    */
   public Increment addColumn(byte[] family, byte[] qualifier, long amount) {
-    Objects.requireNonNull(family, "family cannot be null");
+    Preconditions.checkArgument(family != null, "family cannot be null");
     List<ExtendedCell> list = getCellList(family);
     KeyValue kv = createPutKeyValue(family, qualifier, ts, Bytes.toBytes(amount));
     list.add(kv);

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
@@ -515,7 +515,7 @@ protected long extraHeapSize() {
    * Set the timestamp of the delete.
    */
   public Mutation setTimestamp(long timestamp) {
-    checkTimestamp(ts);
+    checkTimestamp(timestamp);
     this.ts = timestamp;
     return this;
   }