From 79a3f4cba0c364218680d45a068688cdd5efcda0 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Fri, 19 Apr 2024 21:29:23 +0800 Subject: [PATCH] HBASE-28512 Update error prone to 2.26.1 --- .../java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java | 3 ++- .../org/apache/hadoop/hbase/regionserver/TestRegionInfo.java | 2 +- .../hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java | 2 +- pom.xml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java index e5835fd65b61..0fe46194083a 100644 --- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java +++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import javax.servlet.http.HttpServletRequest; @@ -94,7 +95,7 @@ public void testRequestQuoting() throws Exception { quoter.getParameterValues("x")); Mockito.doReturn(null).when(mockReq).getParameterValues("x"); - assertArrayEquals("Test that missing parameters dont cause NPE for array", null, + assertNull("Test that missing parameters dont cause NPE for array", quoter.getParameterValues("x")); } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionInfo.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionInfo.java index de177ec3ace8..60fe39ecc77f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionInfo.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionInfo.java @@ -320,7 +320,7 @@ public void testComparator() { b = RegionInfoBuilder.newBuilder(t).setStartKey(midway).build(); assertTrue(a.compareTo(b) < 0); assertTrue(b.compareTo(a) > 0); - assertEquals(a, a); + assertTrue(a.equals(a)); assertEquals(0, a.compareTo(a)); a = RegionInfoBuilder.newBuilder(t).setStartKey(Bytes.toBytes("a")) .setEndKey(Bytes.toBytes("d")).build(); diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java index 9e9e1554aac0..810bb87baa9e 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java @@ -536,7 +536,7 @@ public void testDeleteFamily() throws Exception { get = new TGet(wrap(rowName)); result = handler.get(table, get); - assertArrayEquals(null, result.getRow()); + assertNull(result.getRow()); assertEquals(0, result.getColumnValuesSize()); } diff --git a/pom.xml b/pom.xml index 635afe9b78ef..195d3d739474 100644 --- a/pom.xml +++ b/pom.xml @@ -892,7 +892,7 @@ --> 8.29 3.1.0 - 2.16 + 2.26.1 2.4.2 1.0.0 1.8