spotless + docstring

Author: Daniel Roudnitsky

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java

@@ -22,7 +22,6 @@
 import java.util.Objects;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HBaseIOException;
 import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -86,7 +85,8 @@ public boolean filterRowKey(Cell cell) throws IOException {
    * RuntimeException when applying a comparator indicates a code bug or misconfigured
    * filter/comparator, we wrap it in `HBaseIOException` to provide a clear exception message/stack
    * trace and prevent propagating a runtime exception up the call stack (which would lead to
-   * unexpected throwable at RpcServer layer and a complicated unclear remote exception on the client)
+   * unexpected throwable at RpcServer layer and a complicated unclear remote exception on the
+   * client)
    */
   public static HBaseIOException wrapInHBaseIOException(RuntimeException e,
     ByteArrayComparable comparator) {

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java

@@ -26,7 +26,6 @@
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.yetus.audience.InterfaceAudience;

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java

@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.yetus.audience.InterfaceAudience;
 

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/QualifierFilter.java

@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.yetus.audience.InterfaceAudience;
 

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RowFilter.java

@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.yetus.audience.InterfaceAudience;
 

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java

@@ -23,7 +23,6 @@
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.util.Bytes;

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ValueFilter.java

@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.yetus.audience.InterfaceAudience;
 

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

@@ -25,7 +25,6 @@
 import java.util.List;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HBaseIOException;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -37,6 +36,11 @@
 @Category(SmallTests.class)
 public class TestFiltersWithComparatorException {
 
+  /**
+   * Tests that filters which take a ByteArrayComparable comparator handle runtime exceptions in the
+   * comparator layer, see HBASE-29672
+   */
+
   byte[] cf = Bytes.toBytes("cf");
   byte[] row = Bytes.toBytes("row1");
   byte[] cq = Bytes.toBytes("q");
@@ -122,8 +126,8 @@ private void testFilter(Filter filter, BadComparator badComparator) {
         filterFunction.run(filter);
       } catch (HBaseIOException e) {
         ioExceptionThrown = true;
+      } catch (IOException ignored) {
       }
-      catch (IOException ignored) {}
       if (invocationsBefore != badComparator.compareToInvokations) {
         Assert.assertTrue("IOException should have been thrown", ioExceptionThrown);
       }