apache · apurtell · Mar 28, 2022
diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
   /**
@@ -21,8 +21,8 @@
   -->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
+    <artifactId>hbase</artifactId>
     <version>2.5.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the client. This tests the hbase-client package and all of the client
  * tests in hbase-server.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java b/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to coprocessors.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the {@code org.apache.hadoop.hbase.filter} package.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as failing commonly on public build infrastructure.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the {@code org.apache.hadoop.hbase.io} package. Things like HFile and
  * the like.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java b/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
@@ -15,23 +15,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as 'integration/system' test, meaning that the test class has the following
  * characteristics:
  * <ul>
- *  <li> Possibly takes hours to complete</li>
- *  <li> Can be run on a mini cluster or an actual cluster</li>
- *  <li> Can make changes to the given cluster (starting stopping daemons, etc)</li>
- *  <li> Should not be run in parallel of other integration tests</li>
+ * <li>Possibly takes hours to complete</li>
+ * <li>Can be run on a mini cluster or an actual cluster</li>
+ * <li>Can make changes to the given cluster (starting stopping daemons, etc)</li>
+ * <li>Should not be run in parallel of other integration tests</li>
  * </ul>
- *
- * Integration / System tests should have a class name starting with "IntegrationTest", and
- * should be annotated with @Category(IntegrationTests.class). Integration tests can be run
- * using the IntegrationTestsDriver class or from mvn verify.
- *
+ * Integration / System tests should have a class name starting with "IntegrationTest", and should
+ * be annotated with @Category(IntegrationTests.class). Integration tests can be run using the
+ * IntegrationTestsDriver class or from mvn verify.
  * @see SmallTests
  * @see MediumTests
  * @see LargeTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,21 +15,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tagging a test as 'large', means that the test class has the following characteristics:
  * <ul>
- *  <li>it can executed in an isolated JVM (Tests can however be executed in different JVM on the
- *  same  machine simultaneously so be careful two concurrent tests end up fighting over ports
- *  or other singular resources).</li>
- *  <li>ideally, the whole large test-suite/class, no matter how many or how few test methods it
- *  has, will run in last less than three minutes</li>
- *  <li>No large test can take longer than ten minutes; it will be killed. See 'Integeration Tests'
- *  if you need to run tests longer than this.</li>
+ * <li>it can executed in an isolated JVM (Tests can however be executed in different JVM on the
+ * same machine simultaneously so be careful two concurrent tests end up fighting over ports or
+ * other singular resources).</li>
+ * <li>ideally, the whole large test-suite/class, no matter how many or how few test methods it has,
+ * will run in last less than three minutes</li>
+ * <li>No large test can take longer than ten minutes; it will be killed. See 'Integeration Tests'
+ * if you need to run tests longer than this.</li>
  * </ul>
- *
  * @see SmallTests
  * @see MediumTests
  * @see IntegrationTests

diff --git a/...-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java b/...-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to mapred or mapreduce.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the master.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,21 +15,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tagging a test as 'medium' means that the test class has the following characteristics:
  * <ul>
- *  <li>it can be executed in an isolated JVM (Tests can however be executed in different JVMs on
- *  the  same  machine simultaneously so be careful two concurrent tests end up fighting over ports
- *  or other singular resources).</li>
- *  <li>ideally, the whole medium test-suite/class, no matter how many or how few test methods it
- *  has, will complete in 50 seconds; otherwise make it a 'large' test.</li>
+ * <li>it can be executed in an isolated JVM (Tests can however be executed in different JVMs on the
+ * same machine simultaneously so be careful two concurrent tests end up fighting over ports or
+ * other singular resources).</li>
+ * <li>ideally, the whole medium test-suite/class, no matter how many or how few test methods it
+ * has, will complete in 50 seconds; otherwise make it a 'large' test.</li>
  * </ul>
- *
- *  Use it for tests that cannot be tagged as 'small'. Use it when you need to start up a cluster.
- *
+ * Use it for tests that cannot be tagged as 'small'. Use it when you need to start up a cluster.
  * @see SmallTests
  * @see LargeTests
  * @see IntegrationTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as not easily falling into any of the below categories.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to RPC.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/...notations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java b/...notations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the regionserver.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java b/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to replication.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to the REST capability of HBase.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/...e-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java b/...e-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as related to security.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,14 +20,14 @@
 /**
  * Tagging a test as 'small' means that the test class has the following characteristics:
  * <ul>
- *  <li>it can be run simultaneously with other small tests all in the same JVM</li>
- *  <li>ideally, the WHOLE implementing test-suite/class, no matter how many or how few test
- *  methods it has, should take less than 15 seconds to complete</li>
- *  <li>it does not use a cluster</li>
+ * <li>it can be run simultaneously with other small tests all in the same JVM</li>
+ * <li>ideally, the WHOLE implementing test-suite/class, no matter how many or how few test methods
+ * it has, should take less than 15 seconds to complete</li>
+ * <li>it does not use a cluster</li>
  * </ul>
- *
  * @see MediumTests
  * @see LargeTests
  * @see IntegrationTests
  */
-public interface SmallTests {}
+public interface SmallTests {
+}
diff --git a/...ions/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java b/...ions/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
- * Tag a test as related to  mapreduce and taking longer than 5 minutes to run on public build
+ * Tag a test as related to mapreduce and taking longer than 5 minutes to run on public build
  * infrastructure.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/...s/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java b/...s/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
  * Tag a test as region tests which takes longer than 5 minutes to run on public build
  * infrastructure.
- *
  * @see org.apache.hadoop.hbase.testclassification.ClientTests
  * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
  * @see org.apache.hadoop.hbase.testclassification.FilterTests

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.testclassification;
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ @@
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
     package org.apache.hadoop.hbase.testclassification;
     /**
@@ Expand Down @@