apache · HorizonNet · Dec 28, 2017
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
@@ -40,6 +40,7 @@
   <suppress checks="EmptyBlockCheck" files="TestServletFilter.java"/>
   <suppress checks="EmptyBlockCheck" files="TestGlobalFilter.java"/>
   <suppress checks="EmptyBlockCheck" files="TestPathFilter.java"/>
+  <suppress checks="EmptyBlockCheck" files="TestZooKeeperTableArchiveClient.java"/>
   <suppress checks="EqualsHashCode" files="StartcodeAgnosticServerName.java"/>
   <suppress checks="MethodLength" files="Branch1CoprocessorMethods.java"/>
   <suppress checks="IllegalImport" message="org\.apache\.htrace\.core"/>

diff --git a/...e/backup/example/HFileArchiveManager.java → ...oop/hbase/backup/HFileArchiveManager.java b/...e/backup/example/HFileArchiveManager.java → ...oop/hbase/backup/HFileArchiveManager.java
@@ -15,18 +15,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.backup.example;
+package org.apache.hadoop.hbase.backup;
 
 import java.io.IOException;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.ZooKeeperConnectionException;
-import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
-import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.client.Connection;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.zookeeper.ZKUtil;
+import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
 import org.apache.hadoop.hbase.zookeeper.ZNodePaths;
+import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,14 +68,14 @@ public HFileArchiveManager enableHFileBackup(byte[] table) throws KeeperExceptio
 
   /**
    * Stop retaining HFiles for the given table in the archive. HFiles will be cleaned up on the next
-   * pass of the {@link org.apache.hadoop.hbase.master.cleaner.HFileCleaner}, if the HFiles are retained by another
-   * cleaner.
+   * pass of the {@link org.apache.hadoop.hbase.master.cleaner.HFileCleaner}, if the HFiles are
+   * retained by another cleaner.
    * @param table name of the table for which to disable hfile retention.
    * @return <tt>this</tt> for chaining.
    * @throws KeeperException if if we can't reach zookeeper to update the hfile cleaner.
    */
   public HFileArchiveManager disableHFileBackup(byte[] table) throws KeeperException {
-      disable(this.zooKeeper, table);
+    disable(this.zooKeeper, table);
     return this;
   }
 
@@ -95,17 +95,16 @@ public HFileArchiveManager disableHFileBackup() throws IOException {
   }
 
   /**
-   * Perform a best effort enable of hfile retention, which relies on zookeeper communicating the //
-   * * change back to the hfile cleaner.
+   * Perform a best effort enable of hfile retention, which relies on zookeeper communicating the
+   * change back to the hfile cleaner.
    * <p>
    * No attempt is made to make sure that backups are successfully created - it is inherently an
    * <b>asynchronous operation</b>.
    * @param zooKeeper watcher connection to zk cluster
    * @param table table name on which to enable archiving
-   * @throws KeeperException
+   * @throws KeeperException if a ZooKeeper operation fails
    */
-  private void enable(ZKWatcher zooKeeper, byte[] table)
-      throws KeeperException {
+  private void enable(ZKWatcher zooKeeper, byte[] table) throws KeeperException {
     LOG.debug("Ensuring archiving znode exists");
     ZKUtil.createAndFailSilent(zooKeeper, archiveZnode);
 

diff --git a/...kup/example/HFileArchiveTableMonitor.java → ...base/backup/HFileArchiveTableMonitor.java b/...kup/example/HFileArchiveTableMonitor.java → ...base/backup/HFileArchiveTableMonitor.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.backup.example;
+package org.apache.hadoop.hbase.backup;
 
 import java.util.List;
 import java.util.Set;

diff --git a/...xample/LongTermArchivingHFileCleaner.java → ...backup/LongTermArchivingHFileCleaner.java b/...xample/LongTermArchivingHFileCleaner.java → ...backup/LongTermArchivingHFileCleaner.java
@@ -15,18 +15,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.backup.example;
+package org.apache.hadoop.hbase.backup;
 
 import java.io.IOException;
 
-import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseInterfaceAudience;
 import org.apache.hadoop.hbase.master.cleaner.BaseHFileCleanerDelegate;
 import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +35,7 @@
  * {@link BaseHFileCleanerDelegate} that only cleans HFiles that don't belong to a table that is
  * currently being archived.
  * <p>
- * This only works properly if the 
+ * This only works properly if the
  * {@link org.apache.hadoop.hbase.master.cleaner.TimeToLiveHFileCleaner}
  *  is also enabled (it always should be), since it may take a little time
  *  for the ZK notification to propagate, in which case we may accidentally
@@ -53,14 +53,18 @@ public class LongTermArchivingHFileCleaner extends BaseHFileCleanerDelegate {
   public boolean isFileDeletable(FileStatus fStat) {
     try {
       // if its a directory, then it can be deleted
-      if (fStat.isDirectory()) return true;
-
+      if (fStat.isDirectory()) {
+        return true;
+      }
+
       Path file = fStat.getPath();
       // check to see if
       FileStatus[] deleteStatus = FSUtils.listStatus(this.fs, file, null);
       // if the file doesn't exist, then it can be deleted (but should never
       // happen since deleted files shouldn't get passed in)
-      if (deleteStatus == null) return true;
+      if (deleteStatus == null) {
+        return true;
+      }
 
       // otherwise, we need to check the file's table and see its being archived
       Path family = file.getParent();
@@ -69,7 +73,8 @@ public boolean isFileDeletable(FileStatus fStat) {
 
       String tableName = table.getName();
       boolean ret = !archiveTracker.keepHFiles(tableName);
-      LOG.debug("Archiver says to [" + (ret ? "delete" : "keep") + "] files for table:" + tableName);
+      LOG.debug("Archiver says to [" + (ret ? "delete" : "keep") + "] files for table:" +
+              tableName);
       return ret;
     } catch (IOException e) {
       LOG.error("Failed to lookup status of:" + fStat.getPath() + ", keeping it just incase.", e);
@@ -97,13 +102,14 @@ public void setConf(Configuration config) {
 
   @Override
   public void stop(String reason) {
-    if (this.isStopped()) return;
+    if (this.isStopped()) {
+      return;
+    }
+
     super.stop(reason);
     if (this.archiveTracker != null) {
       LOG.info("Stopping " + this.archiveTracker);
       this.archiveTracker.stop();
     }
-
   }
-
 }
diff --git a/...kup/example/TableHFileArchiveTracker.java → ...base/backup/TableHFileArchiveTracker.java b/...kup/example/TableHFileArchiveTracker.java → ...base/backup/TableHFileArchiveTracker.java
@@ -15,17 +15,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.backup.example;
+package org.apache.hadoop.hbase.backup;
 
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
-import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.ZooKeeperConnectionException;
-import org.apache.hadoop.hbase.zookeeper.ZKUtil;
 import org.apache.hadoop.hbase.zookeeper.ZKListener;
+import org.apache.hadoop.hbase.zookeeper.ZKUtil;
+import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
+import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,7 +38,7 @@
  * archive.
  */
 @InterfaceAudience.Private
-public class TableHFileArchiveTracker extends ZKListener {
+public final class TableHFileArchiveTracker extends ZKListener {
   private static final Logger LOG = LoggerFactory.getLogger(TableHFileArchiveTracker.class);
   public static final String HFILE_ARCHIVE_ZNODE_PARENT = "hfilearchive";
   private HFileArchiveTableMonitor monitor;
@@ -67,15 +67,16 @@ public void start() throws KeeperException {
   @Override
   public void nodeCreated(String path) {
     // if it is the archive path
-    if (!path.startsWith(archiveHFileZNode)) return;
+    if (!path.startsWith(archiveHFileZNode)) {
+      return;
+    }
 
     LOG.debug("Archive node: " + path + " created");
     // since we are already enabled, just update a single table
     String table = path.substring(archiveHFileZNode.length());
 
     // the top level node has come up, so read in all the tables
     if (table.length() == 0) {
-
       checkEnabledAndUpdate();
       return;
     }
@@ -90,7 +91,9 @@ public void nodeCreated(String path) {
 
   @Override
   public void nodeChildrenChanged(String path) {
-    if (!path.startsWith(archiveHFileZNode)) return;
+    if (!path.startsWith(archiveHFileZNode)) {
+      return;
+    }
 
     LOG.debug("Archive node: " + path + " children changed.");
     // a table was added to the archive
@@ -134,7 +137,9 @@ private void safeStopTrackingTable(String tableZnode) throws KeeperException {
 
   @Override
   public void nodeDeleted(String path) {
-    if (!path.startsWith(archiveHFileZNode)) return;
+    if (!path.startsWith(archiveHFileZNode)) {
+      return;
+    }
 
     LOG.debug("Archive node: " + path + " deleted");
     String table = path.substring(archiveHFileZNode.length());
@@ -260,7 +265,10 @@ public ZKWatcher getZooKeeperWatcher() {
    * Stop this tracker and the passed zookeeper
    */
   public void stop() {
-    if (this.stopped) return;
+    if (this.stopped) {
+      return;
+    }
+
     this.stopped = true;
     this.watcher.close();
   }

diff --git a/.../backup/example/ZKTableArchiveClient.java → ...op/hbase/backup/ZKTableArchiveClient.java b/.../backup/example/ZKTableArchiveClient.java → ...op/hbase/backup/ZKTableArchiveClient.java
@@ -15,17 +15,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.backup.example;
+package org.apache.hadoop.hbase.backup;
 
 import java.io.IOException;
 
-import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
-import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.hbase.client.ClusterConnection;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
 import org.apache.hadoop.hbase.zookeeper.ZNodePaths;
+import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.zookeeper.KeeperException;
 
 /**
@@ -110,7 +110,7 @@ public void disableHFileBackup() throws IOException, KeeperException {
    * @param table name of the table to check
    * @return <tt>true</tt> if it is, <tt>false</tt> otherwise
    * @throws IOException if a connection to ZooKeeper cannot be established
-   * @throws KeeperException
+   * @throws KeeperException if a ZooKeeper operation fails
    */
   public boolean getArchivingEnabled(byte[] table) throws IOException, KeeperException {
     HFileArchiveManager manager = createHFileArchiveManager();

diff --git a/...se/client/example/AsyncClientExample.java → ...doop/hbase/client/AsyncClientExample.java b/...se/client/example/AsyncClientExample.java → ...doop/hbase/client/AsyncClientExample.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.client.example;
+package org.apache.hadoop.hbase.client;
 
 import static org.apache.hadoop.hbase.util.FutureUtils.addListener;
 
@@ -28,11 +28,6 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.AsyncConnection;
-import org.apache.hadoop.hbase.client.AsyncTable;
-import org.apache.hadoop.hbase.client.ConnectionFactory;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Threads;
 import org.apache.hadoop.util.Tool;

diff --git a/...lient/example/BufferedMutatorExample.java → .../hbase/client/BufferedMutatorExample.java b/...lient/example/BufferedMutatorExample.java → .../hbase/client/BufferedMutatorExample.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.client.example;
+package org.apache.hadoop.hbase.client;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,12 +30,6 @@
 import java.util.concurrent.TimeoutException;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.BufferedMutator;
-import org.apache.hadoop.hbase.client.BufferedMutatorParams;
-import org.apache.hadoop.hbase.client.Connection;
-import org.apache.hadoop.hbase.client.ConnectionFactory;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;

diff --git a/...client/example/ExportEndpointExample.java → ...p/hbase/client/ExportEndpointExample.java b/...client/example/ExportEndpointExample.java → ...p/hbase/client/ExportEndpointExample.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.client.example;
+package org.apache.hadoop.hbase.client;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,15 +24,6 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.Admin;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
-import org.apache.hadoop.hbase.client.Connection;
-import org.apache.hadoop.hbase.client.ConnectionFactory;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.coprocessor.Export;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.yetus.audience.InterfaceAudience;

diff --git a/...base/client/example/HttpProxyExample.java → ...hadoop/hbase/client/HttpProxyExample.java b/...base/client/example/HttpProxyExample.java → ...hadoop/hbase/client/HttpProxyExample.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.client.example;
+package org.apache.hadoop.hbase.client;
 
 import static org.apache.hadoop.hbase.util.FutureUtils.addListener;
 
@@ -26,10 +26,6 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.AsyncConnection;
-import org.apache.hadoop.hbase.client.ConnectionFactory;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.ipc.NettyRpcClientConfigHelper;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.yetus.audience.InterfaceAudience;

diff --git a/...t/example/MultiThreadedClientExample.java → ...se/client/MultiThreadedClientExample.java b/...t/example/MultiThreadedClientExample.java → ...se/client/MultiThreadedClientExample.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.client.example;
+package org.apache.hadoop.hbase.client;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,14 +35,6 @@
 import org.apache.hadoop.hbase.CellBuilderFactory;
 import org.apache.hadoop.hbase.CellBuilderType;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.Connection;
-import org.apache.hadoop.hbase.client.ConnectionFactory;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.RegionLocator;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.util.Tool;
@@ -61,7 +53,7 @@
  *
  * <pre>
  * Usage:
- * bin/hbase org.apache.hadoop.hbase.client.example.MultiThreadedClientExample testTableName 500000
+ * bin/hbase org.apache.hadoop.hbase.client.MultiThreadedClientExample testTableName 500000
  * </pre>
  *
  * <p>