diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java index 5be224c..f835857 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java @@ -18,14 +18,15 @@ package org.apache.hadoop.hbase; -import com.google.protobuf.InvalidProtocolBufferException; +import java.util.UUID; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos; import org.apache.hadoop.hbase.util.Bytes; -import java.util.UUID; +import com.google.protobuf.InvalidProtocolBufferException; /** * The identifier for this cluster. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java index 7599e3e..410f369 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java @@ -26,7 +26,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.master.RegionState; @@ -38,6 +37,7 @@ import org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileConte import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.VersionedWritable; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java index d9e2bdc..37f1a33 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java @@ -18,8 +18,8 @@ package org.apache.hadoop.hbase; import java.io.IOException; import java.util.concurrent.ExecutorService; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.HTableInterface; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java hbase-client/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java index b566fcf..8be2518 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.HBaseIOException; /** * Subclass if exception is not meant to be retried: e.g. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/DroppedSnapshotException.java hbase-client/src/main/java/org/apache/hadoop/hbase/DroppedSnapshotException.java index c4799b2..6ff1b1f 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/DroppedSnapshotException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/DroppedSnapshotException.java @@ -14,11 +14,11 @@ */ package org.apache.hadoop.hbase; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.io.IOException; - /** * Thrown during flush if the possibility snapshot content was not properly diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java index 4958fb7..8da0647 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java @@ -24,8 +24,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import com.google.common.base.Preconditions; -import com.google.protobuf.InvalidProtocolBufferException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; @@ -41,6 +39,9 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.PrettyPrinter; import org.apache.hadoop.hbase.util.PrettyPrinter.Unit; +import com.google.common.base.Preconditions; +import com.google.protobuf.InvalidProtocolBufferException; + /** * An HColumnDescriptor contains information about a column family such as the * number of versions, compression settings, etc. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java index 49f31d6..82beb0b 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java @@ -18,30 +18,25 @@ */ package org.apache.hadoop.hbase; -import java.io.ByteArrayInputStream; -import java.io.DataInput; import java.io.DataInputStream; -import java.io.DataOutput; -import java.io.EOFException; import java.io.IOException; -import java.io.SequenceInputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.KeyValue.KVComparator; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.master.RegionState; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JenkinsHash; import org.apache.hadoop.hbase.util.MD5Hash; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java index 058819b..874aaf0 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java @@ -18,7 +18,6 @@ */ package org.apache.hadoop.hbase; -import javax.annotation.Nonnull; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -33,12 +32,13 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.regex.Matcher; -import com.google.protobuf.InvalidProtocolBufferException; +import javax.annotation.Nonnull; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; @@ -51,6 +51,8 @@ import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; +import com.google.protobuf.InvalidProtocolBufferException; + /** * HTableDescriptor contains the details about an HBase table such as the descriptors of * all the column families, is the table a catalog table, -ROOT- or diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/InvalidFamilyOperationException.java hbase-client/src/main/java/org/apache/hadoop/hbase/InvalidFamilyOperationException.java index bbe6e9e..5d9c2ed 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/InvalidFamilyOperationException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/InvalidFamilyOperationException.java @@ -21,8 +21,6 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.io.IOException; - /** * Thrown if a request is table schema modification is requested but * made for an invalid family name. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/MasterNotRunningException.java hbase-client/src/main/java/org/apache/hadoop/hbase/MasterNotRunningException.java index a85b164..ddd03e8 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/MasterNotRunningException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/MasterNotRunningException.java @@ -18,11 +18,11 @@ */ package org.apache.hadoop.hbase; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.io.IOException; - /** * Thrown if the master is not running */ diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java index 45a561a..3282838 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java @@ -17,13 +17,22 @@ */ package org.apache.hadoop.hbase; -import com.google.common.annotations.VisibleForTesting; -import com.google.protobuf.ServiceException; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; @@ -45,17 +54,8 @@ import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.PairOfSameType; import org.apache.hadoop.hbase.util.Threads; -import java.io.IOException; -import java.io.InterruptedIOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.NavigableMap; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import com.google.common.annotations.VisibleForTesting; +import com.google.protobuf.ServiceException; /** * Read/write operations on region and assignment information store in diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/NotServingRegionException.java hbase-client/src/main/java/org/apache/hadoop/hbase/NotServingRegionException.java index 1523ff6..8975c74 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/NotServingRegionException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/NotServingRegionException.java @@ -18,12 +18,12 @@ */ package org.apache.hadoop.hbase; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.util.Bytes; -import java.io.IOException; - /** * Thrown by a region server if it is sent a request for a region it is not * serving. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java hbase-client/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java index 33ff8b1..a5ae44b 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.HBaseIOException; /** * This exception is thrown by the master when a region server was shut down and diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/RegionException.java hbase-client/src/main/java/org/apache/hadoop/hbase/RegionException.java index 13d2f80..24ea16c 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/RegionException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/RegionException.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.HBaseIOException; /** * Thrown when something happens related to region handling. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java index 00d22fe..18e5d67 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java @@ -20,20 +20,19 @@ package org.apache.hadoop.hbase; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.TreeSet; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos; -import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Strings; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.TreeSet; - /** * This class is used for exporting current state of load on a RegionServer. */ diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/TableExistsException.java hbase-client/src/main/java/org/apache/hadoop/hbase/TableExistsException.java index 9590e4b..00cabbf 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/TableExistsException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/TableExistsException.java @@ -16,7 +16,6 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.TableName; /** * Thrown when a table exists but should not diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotDisabledException.java hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotDisabledException.java index ea707bf..9b5f728 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotDisabledException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotDisabledException.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.util.Bytes; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotEnabledException.java hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotEnabledException.java index 210b875..0f78ee6 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotEnabledException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotEnabledException.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotFoundException.java hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotFoundException.java index 2433a14..8ac5e20 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotFoundException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/TableNotFoundException.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.util.Bytes; /** Thrown when a table can not be located */ diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/YouAreDeadException.java hbase-client/src/main/java/org/apache/hadoop/hbase/YouAreDeadException.java index 94dec24..37d5ccc 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/YouAreDeadException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/YouAreDeadException.java @@ -18,11 +18,11 @@ */ package org.apache.hadoop.hbase; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.io.IOException; - /** * This exception is thrown by the master when a region server reports and is * already being processed as dead. This can happen when a region server loses diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ZooKeeperConnectionException.java hbase-client/src/main/java/org/apache/hadoop/hbase/ZooKeeperConnectionException.java index 7aebf33..422a659 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ZooKeeperConnectionException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ZooKeeperConnectionException.java @@ -18,11 +18,11 @@ */ package org.apache.hadoop.hbase; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.io.IOException; - /** * Thrown if the client can't connect to zookeeper */ diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java index 18be1d9..5743fd5 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java @@ -18,9 +18,8 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * A Get, Put, Increment, Append, or Delete associated with it's region. Used internally by diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java index 6d06efe..a08cf79 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java @@ -18,7 +18,12 @@ */ package org.apache.hadoop.hbase.client; -import com.google.protobuf.ServiceException; +import java.io.Closeable; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.ClusterStatus; @@ -34,9 +39,9 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.UnknownRegionException; import org.apache.hadoop.hbase.ZooKeeperConnectionException; -import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos; @@ -50,11 +55,7 @@ import org.apache.hadoop.hbase.snapshot.SnapshotCreationException; import org.apache.hadoop.hbase.snapshot.UnknownSnapshotException; import org.apache.hadoop.hbase.util.Pair; -import java.io.Closeable; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; +import com.google.protobuf.ServiceException; /** * The administrative API for HBase. Obtain an instance from an {@link Connection#getAdmin()} and diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index 6556f8b..9e3be3e 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -23,11 +23,11 @@ import java.util.Map; import java.util.NavigableMap; import java.util.UUID; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.security.access.Permission; import org.apache.hadoop.hbase.security.visibility.CellVisibility; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Attributes.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Attributes.java index dbf9da9..78d3398 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Attributes.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Attributes.java @@ -19,11 +19,11 @@ package org.apache.hadoop.hbase.client; +import java.util.Map; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.util.Map; - @InterfaceAudience.Public @InterfaceStability.Stable public interface Attributes { diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java index 652ae99..ac6c82e 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java @@ -20,11 +20,6 @@ package org.apache.hadoop.hbase.client; import java.io.IOException; import java.lang.management.ManagementFactory; -import java.net.Inet4Address; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.Enumeration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java index 9d59242..05202c8 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java @@ -24,7 +24,6 @@ import java.util.concurrent.ExecutorService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; @@ -35,7 +34,7 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.UnknownScannerException; -import org.apache.hadoop.hbase.client.RpcRetryingCallerFactory; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.exceptions.OutOfOrderScannerNextException; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallReversedScanner.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallReversedScanner.java index 2cab830..86ff424 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallReversedScanner.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallReversedScanner.java @@ -20,20 +20,20 @@ package org.apache.hadoop.hbase.client; +import java.io.IOException; +import java.util.concurrent.ExecutorService; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; import org.apache.hadoop.hbase.util.Bytes; -import java.io.IOException; -import java.util.concurrent.ExecutorService; - /** * Client scanner for small reversed scan. Generally, only one RPC is called to fetch the * scan results, unless the results cross multiple regions or the row count of diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java index 478ba76..90fb1c2 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java @@ -24,12 +24,12 @@ import java.util.concurrent.ExecutorService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.metrics.ScanMetrics; import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java index ad67f63..528e7d0 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java @@ -21,13 +21,13 @@ package org.apache.hadoop.hbase.client; import java.io.IOException; import java.util.List; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.ZooKeeperConnectionException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.AdminService; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ClientService; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MasterService; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java index 475ae01..5756232 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java @@ -30,18 +30,6 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.DatagramChannel; import io.netty.channel.socket.DatagramPacket; import io.netty.channel.socket.nio.NioDatagramChannel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HBaseInterfaceAudience; -import org.apache.hadoop.hbase.ClusterStatus; -import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos; -import org.apache.hadoop.hbase.util.Addressing; -import org.apache.hadoop.hbase.util.ExceptionUtil; -import org.apache.hadoop.hbase.util.Threads; import java.io.Closeable; import java.io.IOException; @@ -53,6 +41,19 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.ClusterStatus; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos; +import org.apache.hadoop.hbase.util.Addressing; +import org.apache.hadoop.hbase.util.ExceptionUtil; +import org.apache.hadoop.hbase.util.Threads; + /** * A class that receives the cluster status, and provide it as a set of service to the client. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Connection.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Connection.java index 92b3f04..55237be 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Connection.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Connection.java @@ -22,11 +22,11 @@ import java.io.Closeable; import java.io.IOException; import java.util.concurrent.ExecutorService; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; /** * A cluster connection encapsulating lower level individual connections to actual servers and diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionAdapter.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionAdapter.java index 9ffdddb..dc2dc29 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionAdapter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionAdapter.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.List; import java.util.concurrent.ExecutorService; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; @@ -30,6 +29,7 @@ import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.ZooKeeperConnectionException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.coprocessor.Batch.Callback; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.AdminService; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ClientService; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java index 4af6740..374ce28 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java @@ -22,11 +22,11 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.util.concurrent.ExecutorService; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.UserProvider; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java index c7270ba..45c32f0 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java @@ -42,7 +42,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Chore; import org.apache.hadoop.hbase.HBaseConfiguration; @@ -60,6 +59,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableNotEnabledException; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.ZooKeeperConnectionException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.AsyncProcess.AsyncRequestFuture; import org.apache.hadoop.hbase.client.MetaScanner.MetaScannerVisitor; import org.apache.hadoop.hbase.client.MetaScanner.MetaScannerVisitorBase; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java index f38c4e0..e26ae48 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java @@ -22,11 +22,11 @@ import java.util.Random; import java.util.concurrent.ExecutorService; import org.apache.commons.logging.Log; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.AdminService; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ClientService; import org.apache.hadoop.hbase.security.User; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java index 0533b31..ad7d89e 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java @@ -26,12 +26,12 @@ import java.util.Map; import java.util.NavigableMap; import java.util.UUID; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.security.access.Permission; import org.apache.hadoop.hbase.security.visibility.CellVisibility; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java index 1d3310e..701cd9c 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java @@ -31,9 +31,9 @@ import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.io.TimeRange; import org.apache.hadoop.hbase.security.access.Permission; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java index 8863bc1..c4f7b10 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java @@ -21,8 +21,8 @@ package org.apache.hadoop.hbase.client; import java.io.IOException; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * This class makes it convenient for one to execute a command in the context diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java index fa62923..b5328bf 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.util.List; import java.util.concurrent.ExecutorService; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; @@ -31,6 +29,8 @@ import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.ZooKeeperConnectionException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.AdminService; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ClientService; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java index b979f87..e81fad0 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java @@ -20,11 +20,12 @@ package org.apache.hadoop.hbase.client; import java.io.IOException; import java.util.concurrent.ExecutorService; + import org.apache.commons.logging.Log; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ZooKeeperConnectionException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.security.User; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java index a1650c1..cd4376d 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java @@ -38,8 +38,6 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseConfiguration; @@ -51,6 +49,8 @@ import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.AsyncProcess.AsyncRequestFuture; import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.client.coprocessor.Batch.Callback; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableFactory.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableFactory.java index d053e66..6970333 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableFactory.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableFactory.java @@ -18,12 +18,12 @@ */ package org.apache.hadoop.hbase.client; +import java.io.IOException; + +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.conf.Configuration; - -import java.io.IOException; /** * Factory for creating HTable instances. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterfaceFactory.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterfaceFactory.java index f3b03bf..b02caa8 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterfaceFactory.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterfaceFactory.java @@ -18,11 +18,11 @@ */ package org.apache.hadoop.hbase.client; +import java.io.IOException; + +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.conf.Configuration; - -import java.io.IOException; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index 6fc3961..8a040f1 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -25,11 +25,11 @@ import java.util.NavigableMap; import java.util.TreeMap; import java.util.UUID; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.io.TimeRange; import org.apache.hadoop.hbase.security.access.Permission; import org.apache.hadoop.hbase.security.visibility.CellVisibility; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java index aaaf545..4ecddb5 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java @@ -25,15 +25,16 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListSet; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java index ede542a..5312dfb 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java @@ -28,7 +28,6 @@ import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; @@ -38,6 +37,7 @@ import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableNotFoundException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ExceptionUtil; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiAction.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiAction.java index eefe40d..8f1dc4d 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiAction.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiAction.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiResponse.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiResponse.java index 9f03d71..089ccff 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiResponse.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiResponse.java @@ -19,16 +19,12 @@ package org.apache.hadoop.hbase.client; -import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.TreeMap; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.Pair; /** * A container for Result objects, grouped by regionName. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java index a75d3b0..b7f7d1b 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java @@ -28,8 +28,6 @@ import java.util.NavigableMap; import java.util.TreeMap; import java.util.UUID; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScannable; import org.apache.hadoop.hbase.CellScanner; @@ -37,6 +35,8 @@ import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.Tag; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.io.HeapSize; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/NoServerForRegionException.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/NoServerForRegionException.java index 672f720..e2e06b9 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/NoServerForRegionException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/NoServerForRegionException.java @@ -18,9 +18,9 @@ */ package org.apache.hadoop.hbase.client; +import org.apache.hadoop.hbase.RegionException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.RegionException; /** * Thrown when no region server can be found for a region diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/OperationWithAttributes.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/OperationWithAttributes.java index d9d54ea..9fdd577 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/OperationWithAttributes.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/OperationWithAttributes.java @@ -19,15 +19,15 @@ package org.apache.hadoop.hbase.client; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ClassSize; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - @InterfaceAudience.Public @InterfaceStability.Evolving public abstract class OperationWithAttributes extends Operation implements Attributes { diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/PerClientRandomNonceGenerator.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/PerClientRandomNonceGenerator.java index 7ac4546..875e1f6 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/PerClientRandomNonceGenerator.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/PerClientRandomNonceGenerator.java @@ -21,8 +21,8 @@ package org.apache.hadoop.hbase.client; import java.util.Arrays; import java.util.Random; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * NonceGenerator implementation that uses client ID hash + random int as nonce group, diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java index 7a9562e..f0d3a72 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java @@ -28,13 +28,13 @@ import java.util.NavigableMap; import java.util.TreeMap; import java.util.UUID; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.Tag; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.io.HeapSize; import org.apache.hadoop.hbase.security.access.Permission; import org.apache.hadoop.hbase.security.visibility.CellVisibility; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java index 747bdc3..793c3a1 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java @@ -28,6 +28,7 @@ import org.apache.hadoop.hbase.security.access.AccessControlConstants; import org.apache.hadoop.hbase.security.access.Permission; import org.apache.hadoop.hbase.security.visibility.Authorizations; import org.apache.hadoop.hbase.security.visibility.VisibilityConstants; + import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorServiceExec.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorServiceExec.java index 8e9f380..ad1d2a1 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorServiceExec.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorServiceExec.java @@ -19,14 +19,13 @@ package org.apache.hadoop.hbase.client; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.util.Bytes; + import com.google.common.base.Objects; import com.google.protobuf.Descriptors.MethodDescriptor; import com.google.protobuf.Message; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.client.coprocessor.Batch; -import org.apache.hadoop.hbase.util.Bytes; - /** * Represents a coprocessor service method execution against a single region. While coprocessor diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionLocator.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionLocator.java index 677b3c5..8168fe1 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionLocator.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionLocator.java @@ -18,16 +18,16 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.HRegionLocation; -import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.util.Pair; - import java.io.Closeable; import java.io.IOException; import java.util.List; +import org.apache.hadoop.hbase.HRegionLocation; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.util.Pair; + /** * Used to view region location information for a single HBase table. * Obtain an instance from an {@link HConnection}. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionOfflineException.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionOfflineException.java index 6c1d1cd..d6cceb9 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionOfflineException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionOfflineException.java @@ -18,9 +18,9 @@ */ package org.apache.hadoop.hbase.client; +import org.apache.hadoop.hbase.RegionException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.RegionException; /** Thrown when a table can not be located */ @InterfaceAudience.Public diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionReplicaUtil.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionReplicaUtil.java index 01c5234..91d1f9b 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionReplicaUtil.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionReplicaUtil.java @@ -21,8 +21,8 @@ package org.apache.hadoop.hbase.client; import java.util.Collection; import java.util.Iterator; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Utility methods which contain the logic for regions and replicas. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java index 888fd93..37e99f6 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java @@ -25,11 +25,11 @@ import java.net.SocketTimeoutException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.exceptions.RegionMovedException; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ClientService; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java index cd494a4..c6ed801 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.client; import java.io.IOException; import org.apache.hadoop.hbase.RegionLocations; -import org.apache.hadoop.hbase.TableName; /** * Cluster registry. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java index 09c58cf..903b2f3 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java @@ -29,14 +29,14 @@ import java.util.Map; import java.util.NavigableMap; import java.util.TreeMap; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScannable; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.util.Bytes; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ResultScanner.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ResultScanner.java index 8fd28b3..381505c 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ResultScanner.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ResultScanner.java @@ -18,12 +18,12 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; - import java.io.Closeable; import java.io.IOException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; + /** * Interface for client-side scanning. * Go to {@link Table} to obtain instances. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java index e266376..2706718 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java @@ -14,13 +14,12 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; - import java.io.IOException; import java.util.Date; import java.util.List; -import java.util.concurrent.Callable; + +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; /** * Exception thrown by HTable methods when an attempt to do something (like diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java index 253ff8b..650b5a3d 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java @@ -19,11 +19,6 @@ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; -import org.apache.hadoop.hbase.util.Bytes; - import java.io.PrintWriter; import java.io.StringWriter; import java.util.Collection; @@ -33,6 +28,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.hadoop.hbase.DoNotRetryIOException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.util.Bytes; + /** * This subclass of {@link org.apache.hadoop.hbase.client.RetriesExhaustedException} * is thrown when we have more information about which rows were causing which diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ReversedClientScanner.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ReversedClientScanner.java index a03858e..b36cf7f 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ReversedClientScanner.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ReversedClientScanner.java @@ -24,10 +24,10 @@ import java.util.concurrent.ExecutorService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ExceptionUtil; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ReversedScannerCallable.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ReversedScannerCallable.java index 964dcb5..f8910b6 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ReversedScannerCallable.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ReversedScannerCallable.java @@ -23,13 +23,13 @@ import java.io.InterruptedIOException; import java.util.ArrayList; import java.util.List; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.metrics.ScanMetrics; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowTooBigException.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowTooBigException.java index 3da3fd5..53ed7c9 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowTooBigException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowTooBigException.java @@ -18,8 +18,8 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.RegionException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Gets or Scans throw this exception if running without in-row scan flag diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCaller.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCaller.java index a10f561..bf4c40b 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCaller.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCaller.java @@ -29,8 +29,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.DoNotRetryIOException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.ExceptionUtil; import org.apache.hadoop.ipc.RemoteException; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java index 4c5814e..16c1ac0 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java @@ -21,7 +21,19 @@ package org.apache.hadoop.hbase.client; -import com.google.protobuf.ServiceException; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.RunnableFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -38,18 +50,7 @@ import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; -import java.io.IOException; -import java.io.InterruptedIOException; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.RunnableFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; +import com.google.protobuf.ServiceException; /** * Caller that goes to replica if the primary region does no answer within a configurable diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java index ae56dc9..b5bd365 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java @@ -31,9 +31,9 @@ import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.IncompatibleFilterException; import org.apache.hadoop.hbase.io.TimeRange; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java index e24af89..31148f7 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java @@ -24,7 +24,6 @@ import java.net.UnknownHostException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; @@ -38,6 +37,7 @@ import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.UnknownScannerException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.metrics.ScanMetrics; import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java index 440cddf..0de658b 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java @@ -34,11 +34,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.BoundedCompletionService; import org.apache.hadoop.hbase.util.Pair; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerTimeoutException.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerTimeoutException.java index 63ec370..9e0827c 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerTimeoutException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerTimeoutException.java @@ -19,9 +19,9 @@ package org.apache.hadoop.hbase.client; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; /** * Thrown when a scanner has timed out. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index 07e4c08..a408b1d 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -23,20 +23,20 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import com.google.protobuf.Descriptors; -import com.google.protobuf.Message; -import com.google.protobuf.Service; -import com.google.protobuf.ServiceException; - -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.filter.CompareFilter; import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; +import com.google.protobuf.Descriptors; +import com.google.protobuf.Message; +import com.google.protobuf.Service; +import com.google.protobuf.ServiceException; + /** * Used to communicate with a single HBase table. * Obtain an instance from a {@link Connection} and call {@link #close()} afterwards. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableState.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableState.java index 930098e..be9b80c 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableState.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableState.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.client; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHRegionInfo.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHRegionInfo.java index 7fe2a73..33aef79 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHRegionInfo.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHRegionInfo.java @@ -19,9 +19,9 @@ package org.apache.hadoop.hbase.client; +import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.HRegionInfo; @InterfaceAudience.Public @InterfaceStability.Evolving diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHTableDescriptor.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHTableDescriptor.java index 9a58837..606c61d 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHTableDescriptor.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHTableDescriptor.java @@ -19,10 +19,10 @@ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; /** * Read-only table descriptor. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/WrongRowIOException.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/WrongRowIOException.java index 09c1d64..e0609da 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/WrongRowIOException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/WrongRowIOException.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.client; +import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.HBaseIOException; @InterfaceAudience.Public @InterfaceStability.Evolving diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.java index 9b987b5..04fd20f 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.java @@ -20,11 +20,11 @@ package org.apache.hadoop.hbase.client; +import java.io.IOException; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; -import java.io.IOException; - /** * We inherit the current ZooKeeperWatcher implementation to change the semantic * of the close: the new close won't immediately close the connection but diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java index 7cab2cc..11a095e 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java @@ -23,10 +23,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZKUtil; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java index ea0e1df..85ce4e2 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java @@ -31,11 +31,11 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java index 8fc00a3..e14bda6 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java @@ -19,11 +19,11 @@ package org.apache.hadoop.hbase.client.coprocessor; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.io.IOException; - /** * A collection of interfaces and utilities used for interacting with custom RPC * interfaces exposed by Coprocessors. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java index d693f0c..97724bd 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; -import org.apache.hadoop.hbase.util.ByteStringer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.coprocessor.ColumnInterpreter; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BigDecimalMsg; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java index 9aac6bf..8b0c690 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java @@ -20,13 +20,12 @@ package org.apache.hadoop.hbase.client.coprocessor; import java.io.IOException; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.coprocessor.ColumnInterpreter; -import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.DoubleMsg; +import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg; import org.apache.hadoop.hbase.util.Bytes; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java index e63fd3b..e8e5e3a 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hbase.client.coprocessor; import java.io.IOException; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.coprocessor.ColumnInterpreter; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.LongMsg; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/SecureBulkLoadClient.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/SecureBulkLoadClient.java index 90564e4..0fcd419 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/SecureBulkLoadClient.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/SecureBulkLoadClient.java @@ -21,12 +21,14 @@ package org.apache.hadoop.hbase.client.coprocessor; import static org.apache.hadoop.hbase.HConstants.EMPTY_START_ROW; import static org.apache.hadoop.hbase.HConstants.LAST_ROW; -import org.apache.hadoop.hbase.client.Table; -import org.apache.hadoop.hbase.util.ByteStringer; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.ipc.BlockingRpcCallback; import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; import org.apache.hadoop.hbase.ipc.ServerRpcController; @@ -34,13 +36,10 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos; import org.apache.hadoop.hbase.security.SecureBulkLoadUtil; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.security.token.Token; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - /** * Client proxy for SecureBulkLoadProtocol * used in conjunction with SecureBulkLoadEndpoint diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java index cf3ad7a..3a33760 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java @@ -22,7 +22,6 @@ import java.io.Closeable; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -33,14 +32,14 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.client.HConnectionManager; import org.apache.hadoop.hbase.replication.ReplicationException; @@ -49,6 +48,7 @@ import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; import org.apache.hadoop.hbase.replication.ReplicationPeers; import org.apache.hadoop.hbase.replication.ReplicationQueuesClient; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; +import org.apache.zookeeper.KeeperException; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/coprocessor/ColumnInterpreter.java hbase-client/src/main/java/org/apache/hadoop/hbase/coprocessor/ColumnInterpreter.java index 00ae239..708f189 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/coprocessor/ColumnInterpreter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/coprocessor/ColumnInterpreter.java @@ -21,10 +21,8 @@ package org.apache.hadoop.hbase.coprocessor; import java.io.IOException; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.coprocessor.LongColumnInterpreter; import com.google.protobuf.Message; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorException.java hbase-client/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorException.java index 330b9d5..9946d97 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorException.java @@ -18,9 +18,9 @@ */ package org.apache.hadoop.hbase.coprocessor; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; /** * Thrown if a coprocessor encounters any exception. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java index cb34d3d..3042ad8 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.exceptions; +import org.apache.hadoop.hbase.RegionException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.RegionException; /** * Thrown when something is wrong in trying to merge two regions. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/OperationConflictException.java hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/OperationConflictException.java index ca5eeb0..c40b8d9 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/OperationConflictException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/OperationConflictException.java @@ -18,9 +18,9 @@ */ package org.apache.hadoop.hbase.exceptions; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; /** * The exception that is thrown if there's duplicate execution of non-idempotent operation. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/OutOfOrderScannerNextException.java hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/OutOfOrderScannerNextException.java index 5a49be1..6357bd6 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/OutOfOrderScannerNextException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/OutOfOrderScannerNextException.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hbase.exceptions; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.DoNotRetryIOException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Thrown by a RegionServer while doing next() calls on a ResultScanner. Both client and server diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionInRecoveryException.java hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionInRecoveryException.java index 78b7c42..06db472 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionInRecoveryException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionInRecoveryException.java @@ -18,9 +18,9 @@ */ package org.apache.hadoop.hbase.exceptions; +import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.NotServingRegionException; /** * Thrown when a read request issued against a region which is in recovering state. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionMovedException.java hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionMovedException.java index c7bd3f0..c76be0f 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionMovedException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionMovedException.java @@ -19,11 +19,11 @@ package org.apache.hadoop.hbase.exceptions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; /** * Subclass if the server knows the region is now on another server. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionOpeningException.java hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionOpeningException.java index efb79f9..8833372 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionOpeningException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/RegionOpeningException.java @@ -20,10 +20,9 @@ package org.apache.hadoop.hbase.exceptions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.NotServingRegionException; -import org.apache.hadoop.ipc.RemoteException; /** * Subclass if the server knows the region is now on another server. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java index d5c2613..0fc624f 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java @@ -19,13 +19,14 @@ package org.apache.hadoop.hbase.filter; -import com.google.protobuf.InvalidProtocolBufferException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos; import org.apache.hadoop.hbase.util.Bytes; +import com.google.protobuf.InvalidProtocolBufferException; + /** * A binary comparator which lexicographically compares against the specified * byte array using {@link org.apache.hadoop.hbase.util.Bytes#compareTo(byte[], byte[])}. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java index c05eb8f..b6311b0 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java @@ -19,13 +19,14 @@ package org.apache.hadoop.hbase.filter; -import com.google.protobuf.InvalidProtocolBufferException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos; import org.apache.hadoop.hbase.util.Bytes; +import com.google.protobuf.InvalidProtocolBufferException; + /** * A comparator which compares against a specified byte array, but only compares * up to the length of this byte array. For the rest it is similar to diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BitComparator.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BitComparator.java index 0b7c52d..d527a2c 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BitComparator.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BitComparator.java @@ -19,12 +19,13 @@ package org.apache.hadoop.hbase.filter; -import com.google.protobuf.InvalidProtocolBufferException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos; +import com.google.protobuf.InvalidProtocolBufferException; + /** * A bit comparator which performs the specified bitwise operation on each of the bytes * with the specified byte array. Then returns whether the result is non-zero. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java index c6e42d4..4642ab9 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java @@ -18,11 +18,11 @@ */ package org.apache.hadoop.hbase.filter; -import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java index 6107f32..572de9f 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java @@ -21,9 +21,9 @@ package org.apache.hadoop.hbase.filter; import java.util.ArrayList; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java index 9795695..673ca6e 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java @@ -20,10 +20,10 @@ package org.apache.hadoop.hbase.filter; import java.util.ArrayList; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; import org.apache.hadoop.hbase.util.ByteStringer; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java index c8474ba..d2f058a 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java @@ -21,10 +21,10 @@ package org.apache.hadoop.hbase.filter; import java.util.ArrayList; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; import org.apache.hadoop.hbase.util.ByteStringer; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java index e75d8ba..9963af6 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java @@ -23,10 +23,10 @@ import static org.apache.hadoop.hbase.util.Bytes.len; import java.util.ArrayList; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; import org.apache.hadoop.hbase.util.ByteStringer; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java index 567f841..319e123 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java @@ -19,7 +19,8 @@ package org.apache.hadoop.hbase.filter; -import com.google.common.base.Preconditions; +import java.util.ArrayList; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; @@ -28,7 +29,7 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType; import org.apache.hadoop.hbase.util.Bytes; -import java.util.ArrayList; +import com.google.common.base.Preconditions; /** * This is a generic filter to be used to filter by comparison. It takes an * operator (equal, greater, not equal, etc) and a byte [] comparator. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java index 5cfedaa..4fe0522 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java @@ -25,14 +25,14 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.hadoop.hbase.util.ByteStringer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import com.google.common.base.Preconditions; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java index c7b0b66..e289026 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java @@ -22,9 +22,9 @@ package org.apache.hadoop.hbase.filter; import java.io.IOException; import java.util.ArrayList; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/Filter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/Filter.java index d5d87c3..d66ad50 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/Filter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/Filter.java @@ -22,9 +22,9 @@ package org.apache.hadoop.hbase.filter; import java.io.IOException; import java.util.List; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java index 2255097..a04dd89 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Abstract base class to help you implement new Filters. Common "ignore" or NOOP type diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java index d98ca8b..ba1a818 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java @@ -23,11 +23,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterWrapper.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterWrapper.java index a5a0eee..5176115 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterWrapper.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterWrapper.java @@ -22,8 +22,8 @@ package org.apache.hadoop.hbase.filter; import java.io.IOException; import java.util.List; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java index ffcf78a..77ed7d9 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java @@ -20,9 +20,9 @@ package org.apache.hadoop.hbase.filter; import java.util.ArrayList; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java index fc40982..622f5ab 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java @@ -18,10 +18,13 @@ package org.apache.hadoop.hbase.filter; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; +import java.util.Set; +import java.util.TreeSet; + import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; import org.apache.hadoop.hbase.util.ByteStringer; @@ -30,9 +33,6 @@ import org.apache.hadoop.hbase.util.Bytes; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import java.util.Set; -import java.util.TreeSet; - /** * The filter looks for the given columns in KeyValue. Once there is a match for * any one of the columns, it returns ReturnCode.NEXT_ROW for remaining diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java index 3971330..9b99b71 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java @@ -21,11 +21,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair; @@ -33,6 +32,7 @@ import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; +import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.InvalidProtocolBufferException; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java index 4ca6cf8..cf2d153 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java @@ -21,12 +21,12 @@ package org.apache.hadoop.hbase.filter; import java.util.ArrayList; -import org.apache.hadoop.hbase.util.ByteStringer; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import com.google.common.base.Preconditions; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java index cebb26a..2a2b525 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java @@ -22,11 +22,11 @@ package org.apache.hadoop.hbase.filter; import java.io.IOException; import java.util.ArrayList; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java index 700d6db..b7ec11a 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java @@ -22,10 +22,10 @@ import java.util.Arrays; import java.util.Comparator; import java.util.TreeSet; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; import org.apache.hadoop.hbase.util.ByteStringer; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java index 060219e..0dbd97b 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java @@ -18,17 +18,17 @@ */ package org.apache.hadoop.hbase.filter; -import com.google.common.base.Preconditions; -import com.google.protobuf.InvalidProtocolBufferException; +import java.io.IOException; +import java.util.ArrayList; + +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; -import org.apache.hadoop.hbase.filter.Filter.ReturnCode; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; -import java.io.IOException; -import java.util.ArrayList; +import com.google.common.base.Preconditions; +import com.google.protobuf.InvalidProtocolBufferException; /** * Implementation of Filter interface that limits results to a specific page * size. It terminates scanning once the number of filter-passed rows is > diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java index 8e6cfae..3a20772 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java @@ -18,11 +18,11 @@ */ package org.apache.hadoop.hbase.filter; +import java.nio.ByteBuffer; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.nio.ByteBuffer; - /** * ParseConstants holds a bunch of constants related to parsing Filter Strings * Used by {@link ParseFilter} diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java index 9d6bd3c..8101f4a 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java @@ -18,14 +18,6 @@ */ package org.apache.hadoop.hbase.filter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; -import org.apache.hadoop.hbase.util.Bytes; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.nio.ByteBuffer; @@ -38,6 +30,14 @@ import java.util.Map; import java.util.Set; import java.util.Stack; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; +import org.apache.hadoop.hbase.util.Bytes; + /** * This class allows a user to specify a filter via a string * The string is parsed using the methods of this class and diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java index 323cd69..5b56748 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java @@ -19,18 +19,18 @@ package org.apache.hadoop.hbase.filter; -import com.google.common.base.Preconditions; -import org.apache.hadoop.hbase.util.ByteStringer; -import com.google.protobuf.InvalidProtocolBufferException; +import java.util.ArrayList; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; -import java.util.ArrayList; +import com.google.common.base.Preconditions; +import com.google.protobuf.InvalidProtocolBufferException; /** * Pass results that have same row prefix. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/QualifierFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/QualifierFilter.java index ff2a0da..e1c4c57 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/QualifierFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/QualifierFilter.java @@ -22,9 +22,9 @@ package org.apache.hadoop.hbase.filter; import java.io.IOException; import java.util.ArrayList; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RandomRowFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RandomRowFilter.java index bff404c..2a25b32 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RandomRowFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RandomRowFilter.java @@ -21,9 +21,9 @@ package org.apache.hadoop.hbase.filter; import java.util.Random; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RegexStringComparator.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RegexStringComparator.java index 6e4f7d0..127aa4c 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RegexStringComparator.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RegexStringComparator.java @@ -18,8 +18,6 @@ */ package org.apache.hadoop.hbase.filter; -import com.google.protobuf.InvalidProtocolBufferException; - import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; import java.util.Arrays; @@ -32,7 +30,6 @@ import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos; import org.apache.hadoop.hbase.util.Bytes; - import org.jcodings.Encoding; import org.jcodings.EncodingDB; import org.jcodings.specific.UTF8Encoding; @@ -41,6 +38,8 @@ import org.joni.Option; import org.joni.Regex; import org.joni.Syntax; +import com.google.protobuf.InvalidProtocolBufferException; + /** * This comparator is for use with {@link CompareFilter} implementations, such * as {@link RowFilter}, {@link QualifierFilter}, and {@link ValueFilter}, for diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RowFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RowFilter.java index d975486..b6407f1 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RowFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/RowFilter.java @@ -22,9 +22,9 @@ package org.apache.hadoop.hbase.filter; import java.io.IOException; import java.util.ArrayList; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java index af0ec1d..d030fd2 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java @@ -24,10 +24,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java index f72d653..e8f8f98 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java @@ -22,13 +22,12 @@ package org.apache.hadoop.hbase.filter; import java.io.IOException; import java.util.ArrayList; -import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; @@ -36,6 +35,7 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import com.google.common.base.Preconditions; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SkipFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SkipFilter.java index f6d120b..ce8e511 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SkipFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SkipFilter.java @@ -21,9 +21,9 @@ package org.apache.hadoop.hbase.filter; import java.io.IOException; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SubstringComparator.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SubstringComparator.java index 5eb3703..63fd0a3 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SubstringComparator.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SubstringComparator.java @@ -18,13 +18,14 @@ */ package org.apache.hadoop.hbase.filter; -import com.google.protobuf.InvalidProtocolBufferException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos; import org.apache.hadoop.hbase.util.Bytes; +import com.google.protobuf.InvalidProtocolBufferException; + /** * This comparator is for use with SingleColumnValueFilter, for filtering based on diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java index 5c53524..32a3d73 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java @@ -17,17 +17,18 @@ */ package org.apache.hadoop.hbase.filter; -import com.google.common.base.Preconditions; -import com.google.protobuf.InvalidProtocolBufferException; +import java.util.ArrayList; +import java.util.List; +import java.util.TreeSet; + +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; -import java.util.ArrayList; -import java.util.List; -import java.util.TreeSet; +import com.google.common.base.Preconditions; +import com.google.protobuf.InvalidProtocolBufferException; /** * Filter that returns only cells whose timestamp (version) is diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ValueFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ValueFilter.java index 5a46d7a..a2c5eb2 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ValueFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ValueFilter.java @@ -19,16 +19,17 @@ package org.apache.hadoop.hbase.filter; -import com.google.protobuf.InvalidProtocolBufferException; +import java.io.IOException; +import java.util.ArrayList; + +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; -import java.io.IOException; -import java.util.ArrayList; +import com.google.protobuf.InvalidProtocolBufferException; /** * This filter is used to filter based on column value. It takes an diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/filter/WhileMatchFilter.java hbase-client/src/main/java/org/apache/hadoop/hbase/filter/WhileMatchFilter.java index 7263e1b..31d4f77 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/WhileMatchFilter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/WhileMatchFilter.java @@ -21,9 +21,9 @@ package org.apache.hadoop.hbase.filter; import java.io.IOException; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java index c10a098..938797c 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java @@ -18,6 +18,10 @@ package org.apache.hadoop.hbase.ipc; +import java.io.IOException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.protobuf.ResponseConverter; @@ -30,10 +34,6 @@ import com.google.protobuf.RpcChannel; import com.google.protobuf.RpcController; import com.google.protobuf.Service; import com.google.protobuf.ServiceException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.IOException; /** * Base class which provides clients with an RPC connection to diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/FatalConnectionException.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/FatalConnectionException.java index 9bfb651..86d3b89 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/FatalConnectionException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/FatalConnectionException.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.ipc; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; /** * Thrown when server finds fatal issue w/ connection setup: e.g. bad rpc version diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java index 118a895..1bef719 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java @@ -20,15 +20,15 @@ package org.apache.hadoop.hbase.ipc; import java.io.IOException; -import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponse; +import org.apache.hadoop.hbase.util.ByteStringer; import com.google.protobuf.Descriptors; import com.google.protobuf.Message; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.java index 3e7a7a2..141f234 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.java @@ -19,12 +19,12 @@ package org.apache.hadoop.hbase.ipc; import java.util.List; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.CellScannable; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Optionally carries Cells across the proxy/service interface down into ipc. On its diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java index 026c64b..8c75f4f 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java @@ -20,18 +20,18 @@ package org.apache.hadoop.hbase.ipc; import java.io.IOException; -import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.client.RegionServerCallable; import org.apache.hadoop.hbase.client.RpcRetryingCallerFactory; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponse; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import com.google.protobuf.Descriptors; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java index cf22dd5..122bfdc 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java @@ -24,7 +24,6 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponse; import org.apache.hadoop.hbase.util.ByteStringer; - import com.google.protobuf.Descriptors; import com.google.protobuf.Message; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RemoteWithExtrasException.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RemoteWithExtrasException.java index 47e8937..a80cbf3 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RemoteWithExtrasException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RemoteWithExtrasException.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.ipc; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.ipc.RemoteException; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java index 522971b..c520bbf 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java @@ -19,24 +19,48 @@ package org.apache.hadoop.hbase.ipc; -import com.google.common.annotations.VisibleForTesting; -import com.google.protobuf.BlockingRpcChannel; -import com.google.protobuf.Descriptors.MethodDescriptor; -import com.google.protobuf.Message; -import com.google.protobuf.Message.Builder; -import com.google.protobuf.RpcCallback; -import com.google.protobuf.RpcController; -import com.google.protobuf.ServiceException; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.Closeable; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InterruptedIOException; +import java.io.OutputStream; +import java.net.ConnectException; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.net.SocketAddress; +import java.net.SocketTimeoutException; +import java.net.UnknownHostException; +import java.nio.ByteBuffer; +import java.security.PrivilegedExceptionAction; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Random; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + +import javax.net.SocketFactory; +import javax.security.sasl.SaslException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.codec.Codec; import org.apache.hadoop.hbase.codec.KeyValueCodec; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; @@ -74,36 +98,14 @@ import org.htrace.Span; import org.htrace.Trace; import org.htrace.TraceScope; -import javax.net.SocketFactory; -import javax.security.sasl.SaslException; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.Closeable; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InterruptedIOException; -import java.io.OutputStream; -import java.net.ConnectException; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.SocketAddress; -import java.net.SocketTimeoutException; -import java.net.UnknownHostException; -import java.nio.ByteBuffer; -import java.security.PrivilegedExceptionAction; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentSkipListMap; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; +import com.google.common.annotations.VisibleForTesting; +import com.google.protobuf.BlockingRpcChannel; +import com.google.protobuf.Descriptors.MethodDescriptor; +import com.google.protobuf.Message; +import com.google.protobuf.Message.Builder; +import com.google.protobuf.RpcCallback; +import com.google.protobuf.RpcController; +import com.google.protobuf.ServiceException; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ServerNotRunningYetException.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ServerNotRunningYetException.java index 07d8683..6d0b9de 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ServerNotRunningYetException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ServerNotRunningYetException.java @@ -19,11 +19,11 @@ package org.apache.hadoop.hbase.ipc; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.io.IOException; - @SuppressWarnings("serial") @InterfaceAudience.Public @InterfaceStability.Evolving diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcController.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcController.java index cbf63fc..0a4354a 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcController.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcController.java @@ -18,14 +18,15 @@ package org.apache.hadoop.hbase.ipc; +import java.io.IOException; + +import org.apache.hadoop.util.StringUtils; + import com.google.protobuf.Descriptors; import com.google.protobuf.Message; import com.google.protobuf.RpcCallback; import com.google.protobuf.RpcController; import com.google.protobuf.Service; -import org.apache.hadoop.util.StringUtils; - -import java.io.IOException; /** * Used for server-side protobuf RPC service invocations. This handler allows diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/StoppedRpcClientException.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/StoppedRpcClientException.java index c11cb28..a224a12 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/StoppedRpcClientException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/StoppedRpcClientException.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.ipc; +import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.HBaseIOException; @InterfaceAudience.Public @InterfaceStability.Evolving diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/TimeLimitedRpcController.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/TimeLimitedRpcController.java index ec98a5f..a56f904 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/TimeLimitedRpcController.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/TimeLimitedRpcController.java @@ -19,12 +19,11 @@ package org.apache.hadoop.hbase.ipc; +import java.util.concurrent.atomic.AtomicReference; + import com.google.protobuf.RpcCallback; import com.google.protobuf.RpcController; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; - public class TimeLimitedRpcController implements RpcController { /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java index dbcbaeb..34c43ce 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java @@ -19,10 +19,10 @@ package org.apache.hadoop.hbase.master; import java.util.Date; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java index a0aaac1..6be8d2d 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java @@ -20,9 +20,6 @@ package org.apache.hadoop.hbase.protobuf; import java.io.IOException; import java.util.List; -import org.apache.hadoop.hbase.util.ByteStringer; - -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.CellScannable; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -31,6 +28,7 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.Action; import org.apache.hadoop.hbase.client.Append; import org.apache.hadoop.hbase.client.Delete; @@ -90,6 +88,7 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableReques import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; +import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnRequest; @@ -107,8 +106,6 @@ import org.apache.hadoop.hbase.util.Pair; import com.google.protobuf.ByteString; -import static org.apache.hadoop.hbase.protobuf.generated.MasterProtos.*; - /** * Helper utility to build protocol buffer requests, * or build components for protocol buffer requests. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java index ca6b67e..ced458a 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java @@ -23,12 +23,12 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.ipc.ServerRpcController; import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsResponse; @@ -40,11 +40,11 @@ import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterRespo import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequest; +import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiResponse; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse; -import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiResponse; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorResponse; @@ -52,7 +52,6 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanRes import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdResponse; import org.apache.hadoop.hbase.regionserver.RegionOpeningState; import org.apache.hadoop.hbase.security.access.UserPermission; -import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.util.StringUtils; import com.google.protobuf.ByteString; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java index 2319b7a..f13ce28 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java @@ -26,14 +26,14 @@ import java.util.Queue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.client.HTable; 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.HTable; import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas; import org.apache.hadoop.util.StringUtils; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettings.java hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettings.java index 6654f9e..592c4db 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettings.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettings.java @@ -19,12 +19,11 @@ package org.apache.hadoop.hbase.quotas; import java.util.concurrent.TimeUnit; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest; -import org.apache.hadoop.hbase.quotas.ThrottleType; @InterfaceAudience.Public @InterfaceStability.Evolving diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java index d15029e..e29fef1 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java @@ -21,13 +21,13 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; +import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest; import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos; import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas; -import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest; @InterfaceAudience.Public @InterfaceStability.Evolving diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java index b758df6..6153876 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java @@ -21,28 +21,27 @@ package org.apache.hadoop.hbase.quotas; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; - import java.util.List; import java.util.Map; import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.filter.CompareFilter; import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.FilterList; import org.apache.hadoop.hbase.filter.QualifierFilter; -import org.apache.hadoop.hbase.filter.RowFilter; import org.apache.hadoop.hbase.filter.RegexStringComparator; +import org.apache.hadoop.hbase.filter.RowFilter; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottleSettings.java hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottleSettings.java index fab2bd0..1f98eb9 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottleSettings.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottleSettings.java @@ -17,17 +17,14 @@ */ package org.apache.hadoop.hbase.quotas; -import java.util.ArrayList; -import java.util.List; import java.util.concurrent.TimeUnit; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; -import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos; -import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest; +import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos; @InterfaceAudience.Private @InterfaceStability.Evolving diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottlingException.java hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottlingException.java index bb24f86..bcad943 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottlingException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottlingException.java @@ -21,8 +21,6 @@ package org.apache.hadoop.hbase.quotas; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.hadoop.util.StringUtils; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/LeaseException.java hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/LeaseException.java index de1726b..d1fdae3 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/LeaseException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/LeaseException.java @@ -18,9 +18,9 @@ */ package org.apache.hadoop.hbase.regionserver; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; /** * Reports a problem with a lease diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/NoSuchColumnFamilyException.java hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/NoSuchColumnFamilyException.java index 4b541c8..d3b1ec1 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/NoSuchColumnFamilyException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/NoSuchColumnFamilyException.java @@ -18,9 +18,9 @@ */ package org.apache.hadoop.hbase.regionserver; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; /** * Thrown if request for nonexistent column family. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/WrongRegionException.java hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/WrongRegionException.java index 4338539..c2460d4 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/WrongRegionException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/WrongRegionException.java @@ -18,11 +18,11 @@ */ package org.apache.hadoop.hbase.regionserver; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.io.IOException; - /** * Thrown when a request contains a key which is not part of this region */ diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FailedLogCloseException.java hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FailedLogCloseException.java index 8af8d75..cc42819 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FailedLogCloseException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FailedLogCloseException.java @@ -18,11 +18,11 @@ */ package org.apache.hadoop.hbase.regionserver.wal; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.io.IOException; - /** * Thrown when we fail close of the write-ahead-log file. * Package private. Only used inside this package. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeer.java hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeer.java index 6925778..b8b5b22 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeer.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeer.java @@ -20,10 +20,10 @@ package org.apache.hadoop.hbase.replication; import java.util.List; import java.util.Map; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * ReplicationPeer manages enabled / disabled state for the peer. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.java hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.java index 848303c..6d42d5b 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.java @@ -20,18 +20,16 @@ package org.apache.hadoop.hbase.replication; import java.io.Closeable; import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.replication.ReplicationAdmin; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeers.java hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeers.java index a601fb5..bd4eb30 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeers.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeers.java @@ -18,13 +18,14 @@ */ package org.apache.hadoop.hbase.replication; +import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Pair; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java index cc49a64..91e0b05 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java @@ -42,8 +42,8 @@ import org.apache.hadoop.hbase.replication.ReplicationPeer.PeerState; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.zookeeper.ZKUtil; -import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.hadoop.hbase.zookeeper.ZKUtil.ZKUtilOp; +import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.zookeeper.KeeperException; import com.google.protobuf.ByteString; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationQueueInfo.java hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationQueueInfo.java index 0664923..cd19157 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationQueueInfo.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationQueueInfo.java @@ -19,14 +19,14 @@ package org.apache.hadoop.hbase.replication; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.ServerName; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.ServerName; + /** * This class is responsible for the parsing logic for a znode representing a queue. * It will extract the peerId if it's recovered as well as the dead region servers diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationQueuesZKImpl.java hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationQueuesZKImpl.java index 0ad94b3..2828546 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationQueuesZKImpl.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationQueuesZKImpl.java @@ -35,8 +35,8 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZKUtil; -import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.hadoop.hbase.zookeeper.ZKUtil.ZKUtilOp; +import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.zookeeper.KeeperException; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java index b469df4..51d7473 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java @@ -18,10 +18,10 @@ */ package org.apache.hadoop.hbase.replication; -import org.apache.hadoop.hbase.classification.InterfaceAudience; - import java.util.List; +import org.apache.hadoop.hbase.classification.InterfaceAudience; + /** * This is the interface for a Replication Tracker. A replication tracker provides the facility to * subscribe and track events that reflect a change in replication state. These events are used by diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/AccessDeniedException.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/AccessDeniedException.java index 8b446f5..07b871d 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/AccessDeniedException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/AccessDeniedException.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.security; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/AuthMethod.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/AuthMethod.java index 38065fd..e2cc3cf 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/AuthMethod.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/AuthMethod.java @@ -19,13 +19,13 @@ package org.apache.hadoop.hbase.security; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.security.UserGroupInformation; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.security.UserGroupInformation; + /** Authentication method */ @InterfaceAudience.Private public enum AuthMethod { diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java index f446c66..f4bc3e9 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java @@ -26,14 +26,14 @@ import java.security.SecureRandom; import javax.crypto.spec.SecretKeySpec; -import org.apache.hadoop.hbase.util.ByteStringer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.io.crypto.Cipher; import org.apache.hadoop.hbase.io.crypto.Encryption; import org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java index 74a9f35..895d067 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java @@ -18,15 +18,13 @@ package org.apache.hadoop.hbase.security; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.io.WritableUtils; -import org.apache.hadoop.ipc.RemoteException; -import org.apache.hadoop.security.SaslInputStream; -import org.apache.hadoop.security.SaslOutputStream; -import org.apache.hadoop.security.token.Token; -import org.apache.hadoop.security.token.TokenIdentifier; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -39,13 +37,15 @@ import javax.security.sasl.Sasl; import javax.security.sasl.SaslClient; import javax.security.sasl.SaslException; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.io.WritableUtils; +import org.apache.hadoop.ipc.RemoteException; +import org.apache.hadoop.security.SaslInputStream; +import org.apache.hadoop.security.SaslOutputStream; +import org.apache.hadoop.security.token.Token; +import org.apache.hadoop.security.token.TokenIdentifier; import com.google.common.annotations.VisibleForTesting; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslUtil.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslUtil.java index 9cde790..726a753 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslUtil.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslUtil.java @@ -18,14 +18,14 @@ */ package org.apache.hadoop.hbase.security; -import org.apache.commons.codec.binary.Base64; -import org.apache.hadoop.hbase.classification.InterfaceAudience; - import java.util.Map; import java.util.TreeMap; import javax.security.sasl.Sasl; +import org.apache.commons.codec.binary.Base64; +import org.apache.hadoop.hbase.classification.InterfaceAudience; + @InterfaceAudience.Private public class SaslUtil { public static final String SASL_DEFAULT_REALM = "default"; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java index 2fde925..30959a0 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java @@ -18,9 +18,9 @@ */ package org.apache.hadoop.hbase.security; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; @InterfaceAudience.Private diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/Permission.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/Permission.java index b190084..9916a51 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/Permission.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/Permission.java @@ -18,7 +18,12 @@ package org.apache.hadoop.hbase.security.access; -import com.google.common.collect.Maps; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.Arrays; +import java.util.Map; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; @@ -26,11 +31,7 @@ import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.VersionedWritable; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.util.Arrays; -import java.util.Map; +import com.google.common.collect.Maps; /** * Base permissions instance representing the ability to perform a given set diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java index a252b9e..87371f7 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java @@ -18,17 +18,17 @@ package org.apache.hadoop.hbase.security.access; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - /** * Represents an authorization for access for the given actions, optionally * restricted to the given column family or column qualifier, over the diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java index 5232377..7d44ddc 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java @@ -18,16 +18,16 @@ package org.apache.hadoop.hbase.security.access; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - /** * Represents an authorization for access over the given table, column family * plus qualifier, for the given user. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java index 868bd81..784aec6 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java @@ -18,16 +18,17 @@ package org.apache.hadoop.hbase.security.token; -import com.google.protobuf.ByteString; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.TokenIdentifier; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; +import com.google.protobuf.ByteString; /** * Represents the identity information stored in an HBase authentication token. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java index bc6e678..2ce2919 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java @@ -18,6 +18,8 @@ package org.apache.hadoop.hbase.security.token; +import java.util.Collection; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; @@ -26,8 +28,6 @@ import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.security.token.TokenSelector; -import java.util.Collection; - @InterfaceAudience.Private public class AuthenticationTokenSelector implements TokenSelector { diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/InvalidLabelException.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/InvalidLabelException.java index 81e665e..d11c167 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/InvalidLabelException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/InvalidLabelException.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.security.visibility; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; @InterfaceAudience.Public @InterfaceStability.Evolving diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/LabelAlreadyExistsException.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/LabelAlreadyExistsException.java index bda9321..3fbf937 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/LabelAlreadyExistsException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/LabelAlreadyExistsException.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.security.visibility; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.DoNotRetryIOException; @InterfaceAudience.Public @InterfaceStability.Evolving diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java index 6eafb6f..5ca5231 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java @@ -22,13 +22,12 @@ import static org.apache.hadoop.hbase.security.visibility.VisibilityConstants.LA import java.io.IOException; import java.util.Map; -import org.apache.hadoop.hbase.client.Table; -import org.apache.hadoop.hbase.util.ByteStringer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.ipc.BlockingRpcCallback; import org.apache.hadoop.hbase.ipc.ServerRpcController; @@ -39,6 +38,7 @@ import org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.Visibil import org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsRequest; import org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse; import org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsService; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import com.google.protobuf.ServiceException; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityConstants.java hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityConstants.java index ce5bca0..c51f401 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityConstants.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityConstants.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.security.visibility; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; @InterfaceAudience.Private diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/ClientSnapshotDescriptionUtils.java hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/ClientSnapshotDescriptionUtils.java index d439c8b..59ba837 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/ClientSnapshotDescriptionUtils.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/ClientSnapshotDescriptionUtils.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.snapshot; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java index 4a28461..5d03eab 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.snapshot; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; -import org.apache.hadoop.hbase.DoNotRetryIOException; /** * General exception base class for when a snapshot fails diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/TablePartiallyOpenException.java hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/TablePartiallyOpenException.java index abeb7af..b27ff65 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/TablePartiallyOpenException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/TablePartiallyOpenException.java @@ -17,13 +17,13 @@ */ package org.apache.hadoop.hbase.snapshot; +import java.io.IOException; + +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.util.Bytes; -import java.io.IOException; - /** * Thrown if a table should be online/offline but is partially open */ diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/util/HasThread.java hbase-client/src/main/java/org/apache/hadoop/hbase/util/HasThread.java index 4457fe0..1738a49 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/util/HasThread.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/util/HasThread.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.util; -import org.apache.hadoop.hbase.classification.InterfaceAudience; - import java.lang.Thread.UncaughtExceptionHandler; +import org.apache.hadoop.hbase.classification.InterfaceAudience; + /** * Abstract class which contains a Thread and delegates the common Thread * methods to that instance. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java index 77e2cd0..4822b0e 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hbase.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Stoppable; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Sleeper for current thread. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/util/Writables.java hbase-client/src/main/java/org/apache/hadoop/hbase/util/Writables.java index 15af6c9..e04d789 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/util/Writables.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/util/Writables.java @@ -18,10 +18,6 @@ */ package org.apache.hadoop.hbase.util; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.io.DataInputBuffer; -import org.apache.hadoop.io.Writable; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -30,6 +26,10 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.io.DataInputBuffer; +import org.apache.hadoop.io.Writable; + /** * Utility class with methods for manipulating Writable objects */ diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java index b2e71e1..8ec3b6a 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java @@ -18,17 +18,8 @@ */ package org.apache.hadoop.hbase.zookeeper; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.util.Strings; -import org.apache.hadoop.net.DNS; -import org.apache.hadoop.util.StringUtils; -import org.apache.zookeeper.server.ServerConfig; -import org.apache.zookeeper.server.ZooKeeperServerMain; -import org.apache.zookeeper.server.quorum.QuorumPeerConfig; -import org.apache.zookeeper.server.quorum.QuorumPeerMain; +import static org.apache.hadoop.hbase.HConstants.DEFAULT_ZK_SESSION_TIMEOUT; +import static org.apache.hadoop.hbase.HConstants.ZK_SESSION_TIMEOUT; import java.io.File; import java.io.IOException; @@ -42,8 +33,17 @@ import java.util.List; import java.util.Map.Entry; import java.util.Properties; -import static org.apache.hadoop.hbase.HConstants.DEFAULT_ZK_SESSION_TIMEOUT; -import static org.apache.hadoop.hbase.HConstants.ZK_SESSION_TIMEOUT; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.util.Strings; +import org.apache.hadoop.net.DNS; +import org.apache.hadoop.util.StringUtils; +import org.apache.zookeeper.server.ServerConfig; +import org.apache.zookeeper.server.ZooKeeperServerMain; +import org.apache.zookeeper.server.quorum.QuorumPeerConfig; +import org.apache.zookeeper.server.quorum.QuorumPeerMain; /** * HBase's version of ZooKeeper's QuorumPeer. When HBase is set to manage diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java index 71492e8..c406aeb 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java @@ -17,10 +17,13 @@ */ package org.apache.hadoop.hbase.zookeeper; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import java.io.IOException; +import java.io.InterruptedIOException; + import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; @@ -28,9 +31,6 @@ import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.data.Stat; -import java.io.IOException; -import java.io.InterruptedIOException; - /** * Manages the location of the current active Master for the RegionServer. *

diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java index 98a25d3..6e185d2 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java @@ -31,11 +31,11 @@ import javax.annotation.Nullable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.NotAllMetaRegionsOnlineException; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.client.RetriesExhaustedException; import org.apache.hadoop.hbase.exceptions.DeserializationException; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKClusterId.java hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKClusterId.java index f0c19e3..b603ab2 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKClusterId.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKClusterId.java @@ -21,9 +21,9 @@ package org.apache.hadoop.hbase.zookeeper; import java.util.UUID; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.ClusterId; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.zookeeper.KeeperException; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java index 37b68b9..75b0175 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java @@ -20,8 +20,6 @@ package org.apache.hadoop.hbase.zookeeper; import java.io.IOException; import java.io.InputStream; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; @@ -29,10 +27,9 @@ import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.util.StringUtils; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Utility methods for reading, and building the ZooKeeper configuration. diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java index 792ed78..495c2bc 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java @@ -22,8 +22,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Stoppable; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.zookeeper.KeeperException; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java index 4d4eba3..2fd0958 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java @@ -35,18 +35,18 @@ import java.util.Properties; import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; -import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.RegionStoreSequenceIds; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.zookeeper.ZKUtil.ZKUtilOp.CreateAndFailSilent; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java index b621200..1ed1e3f 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hbase.zookeeper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Abortable; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.zookeeper.KeeperException; /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java index 8d39ff6..fb98035 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java @@ -28,11 +28,11 @@ import java.util.concurrent.CountDownLatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.ZooKeeperConnectionException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java index e6c2894..09d160b 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java +++ hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java @@ -28,8 +28,8 @@ import org.apache.hadoop.hbase.regionserver.BloomType; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.BuilderStyleTest; -import org.junit.experimental.categories.Category; import org.junit.Test; +import org.junit.experimental.categories.Category; /** Tests the HColumnDescriptor with appropriate arguments */ @Category({MiscTests.class, SmallTests.class}) diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java index 7132b8d..abf3da8 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java +++ hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java @@ -20,20 +20,39 @@ package org.apache.hadoop.hbase.client; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.RegionLocations; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; -import org.apache.hadoop.hbase.testclassification.ClientTests; -import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.AsyncProcess.AsyncRequestFuture; import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.client.coprocessor.Batch.Callback; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.junit.Assert; @@ -44,25 +63,6 @@ import org.junit.experimental.categories.Category; import org.junit.rules.Timeout; import org.mockito.Mockito; -import java.io.IOException; -import java.io.InterruptedIOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; - @Category({ClientTests.class, MediumTests.class}) public class TestAsyncProcess { private static final TableName DUMMY_TABLE = diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java index b9f1ede..d855c74 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java +++ hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java @@ -33,7 +33,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.commons.lang.NotImplementedException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,12 +42,10 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; -import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.RegionTooBusyException; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.testclassification.ClientTests; -import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.protobuf.generated.CellProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; @@ -72,6 +69,9 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType; import org.apache.hadoop.hbase.regionserver.RegionServerStoppedException; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.Threads; diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java index 1617b3a..23e538c 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java +++ hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java @@ -33,15 +33,15 @@ import java.util.List; import java.util.Set; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.testclassification.ClientTests; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.FilterList; import org.apache.hadoop.hbase.filter.KeyOnlyFilter; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Base64; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Assert; diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java index ee65ede..96c4190d 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java +++ hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java @@ -20,14 +20,6 @@ package org.apache.hadoop.hbase.client; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.CellUtil; -import org.apache.hadoop.hbase.testclassification.ClientTests; -import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.KeyValue; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.nio.ByteBuffer; @@ -36,6 +28,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.filter.BinaryComparator; import org.apache.hadoop.hbase.filter.ColumnCountGetFilter; import org.apache.hadoop.hbase.filter.ColumnPaginationFilter; @@ -55,15 +51,19 @@ import org.apache.hadoop.hbase.filter.PageFilter; import org.apache.hadoop.hbase.filter.PrefixFilter; import org.apache.hadoop.hbase.filter.QualifierFilter; import org.apache.hadoop.hbase.filter.RowFilter; -import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; import org.apache.hadoop.hbase.filter.SingleColumnValueExcludeFilter; +import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; import org.apache.hadoop.hbase.filter.SkipFilter; import org.apache.hadoop.hbase.filter.TimestampsFilter; import org.apache.hadoop.hbase.filter.ValueFilter; import org.apache.hadoop.hbase.filter.WhileMatchFilter; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.BuilderStyleTest; import org.apache.hadoop.hbase.util.Bytes; import org.codehaus.jackson.map.ObjectMapper; +import org.junit.Assert; +import org.junit.Test; import org.junit.experimental.categories.Category; /** diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java index f358bf7..129914f 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java +++ hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java @@ -25,11 +25,11 @@ import java.io.IOException; import java.util.Arrays; import java.util.Set; -import org.apache.hadoop.hbase.testclassification.ClientTests; -import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.security.visibility.Authorizations; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Assert; import org.junit.Test; diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java index f0ed3c1..78d718e 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java +++ hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java @@ -25,16 +25,16 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.testclassification.ClientTests; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneResponse; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotResponse; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java index 92d67b1..d0c2223 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java +++ hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java @@ -31,13 +31,13 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.CellUtil; -import org.apache.hadoop.hbase.testclassification.ClientTests; -import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.codec.Codec; import org.apache.hadoop.hbase.codec.KeyValueCodec; import org.apache.hadoop.hbase.io.SizedCellScanner; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ClassSize; import org.apache.hadoop.io.compress.CompressionCodec; diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java index 298344f..ed6f49b 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java +++ hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java @@ -17,7 +17,9 @@ */ package org.apache.hadoop.hbase.security; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.security.Key; import java.security.KeyException; @@ -26,13 +28,12 @@ import java.security.SecureRandom; import javax.crypto.spec.SecretKeySpec; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.testclassification.ClientTests; -import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.io.crypto.KeyProviderForTesting; import org.apache.hadoop.hbase.io.crypto.aes.AES; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; - import org.junit.Test; import org.junit.experimental.categories.Category; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/CellScanner.java hbase-common/src/main/java/org/apache/hadoop/hbase/CellScanner.java index 3b5cdb9..f337122 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/CellScanner.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/CellScanner.java @@ -22,7 +22,6 @@ import java.io.IOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.Cell; /** * An interface for iterating through a sequence of cells. Similar to Java's Iterator, but without diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java index ce0f546..2e72500 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java @@ -26,9 +26,9 @@ import java.util.List; import java.util.Map.Entry; import java.util.NavigableMap; +import org.apache.hadoop.hbase.KeyValue.Type; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.KeyValue.Type; import org.apache.hadoop.hbase.io.HeapSize; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.ByteRange; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/CompoundConfiguration.java hbase-common/src/main/java/org/apache/hadoop/hbase/CompoundConfiguration.java index c0b3580..810303f 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/CompoundConfiguration.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/CompoundConfiguration.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase; import java.io.DataOutput; -import java.io.IOException; +import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; import java.util.HashMap; @@ -29,9 +29,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.collections.iterators.UnmodifiableIterator; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; /** diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java index 808c4c1..9b60d27 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java @@ -24,9 +24,9 @@ import java.util.Map.Entry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.io.util.HeapMemorySizeUtil; import org.apache.hadoop.hbase.util.VersionInfo; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseIOException.java hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseIOException.java index e789b7e..9c3367e 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseIOException.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseIOException.java @@ -17,11 +17,11 @@ */ package org.apache.hadoop.hbase; +import java.io.IOException; + import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import java.io.IOException; - /** * All hbase specific IOExceptions should be subclasses of HBaseIOException */ diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java index 9e969e7..dde15bc 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java @@ -24,8 +24,8 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.KeyValue.Type; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.util.StreamUtils; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java index 31a1313..acdaf08 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java @@ -18,10 +18,6 @@ package org.apache.hadoop.hbase; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.util.Bytes; - import java.util.Collections; import java.util.Comparator; import java.util.HashSet; @@ -30,6 +26,10 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.util.Bytes; + /** * Namespace POJO class. Used to represent and define namespaces. * diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java index 802319e..c560a43 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java @@ -18,16 +18,16 @@ package org.apache.hadoop.hbase; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.KeyValue.KVComparator; -import org.apache.hadoop.hbase.util.Bytes; - import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; +import org.apache.hadoop.hbase.KeyValue.KVComparator; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.util.Bytes; + /** * Immutable POJO class for representing a table name. * Which is of the form: diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/VersionAnnotation.java hbase-common/src/main/java/org/apache/hadoop/hbase/VersionAnnotation.java index f3137ae..f93d7f2 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/VersionAnnotation.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/VersionAnnotation.java @@ -17,7 +17,10 @@ */ package org.apache.hadoop.hbase; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.apache.hadoop.hbase.classification.InterfaceAudience; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java index d7f9f08..2bd650f 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java @@ -23,8 +23,8 @@ import java.io.InputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * TODO javadoc diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseEncoder.java hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseEncoder.java index 6f2231c..7a96abe 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseEncoder.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseEncoder.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hbase.codec; import java.io.IOException; import java.io.OutputStream; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * TODO javadoc diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodec.java hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodec.java index 77cf80a..9d03d89 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodec.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodec.java @@ -22,10 +22,10 @@ import java.io.InputStream; import java.io.OutputStream; import org.apache.commons.io.IOUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseInterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; /** diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodecWithTags.java hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodecWithTags.java index b4efaf8..a614026 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodecWithTags.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodecWithTags.java @@ -22,10 +22,10 @@ import java.io.InputStream; import java.io.OutputStream; import org.apache.commons.io.IOUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseInterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; /** diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java index 7801e3b..7fc1749 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java @@ -20,9 +20,9 @@ package org.apache.hadoop.hbase.codec; import java.io.InputStream; import java.io.OutputStream; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.HBaseInterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.CellOutputStream; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoder; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CodecException.java hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CodecException.java index 440ae78..8ebe25a 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CodecException.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CodecException.java @@ -18,8 +18,8 @@ package org.apache.hadoop.hbase.codec; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HBaseIOException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Thrown when problems in the codec whether setup or context. diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodec.java hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodec.java index cfe9742..f41d6b0 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodec.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodec.java @@ -21,11 +21,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Codec that does KeyValue version 1 serialization. diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.java hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.java index 02158f4..664fcac 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.java @@ -21,11 +21,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Codec that does KeyValue version 1 serialization with serializing tags also. diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/CellOutputStream.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/CellOutputStream.java index 4750413..75429e5 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/CellOutputStream.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/CellOutputStream.java @@ -20,10 +20,10 @@ package org.apache.hadoop.hbase.io; import java.io.IOException; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; /** * Accepts a stream of Cells. This can be used to build a block of cells during compactions diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java index b70e94a..73525c5 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java @@ -18,9 +18,9 @@ package org.apache.hadoop.hbase.io; -import java.io.IOException; import java.io.DataInput; import java.io.DataOutput; +import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/LimitInputStream.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/LimitInputStream.java index 8a21f9e..a9fdd21 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/LimitInputStream.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/LimitInputStream.java @@ -19,13 +19,13 @@ package org.apache.hadoop.hbase.io; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Copied from guava source code v15 (LimitedInputStream) * Guava deprecated LimitInputStream in v14 and removed it in v15. Copying this class here diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/SizedCellScanner.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/SizedCellScanner.java index 9fc7033..ed272ef 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/SizedCellScanner.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/SizedCellScanner.java @@ -16,11 +16,10 @@ * limitations under the License. */ package org.apache.hadoop.hbase.io; +import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.CellScanner; - /** * A CellScanner that knows its size in memory in bytes. * Used playing the CellScanner into an in-memory buffer; knowing the size ahead of time saves diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java index 537437d..26e7b50 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java @@ -25,8 +25,8 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.nio.ByteBuffer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Tag; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.util.Dictionary; import org.apache.hadoop.hbase.io.util.StreamUtils; import org.apache.hadoop.hbase.util.ByteBufferUtils; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java index 8a349db..edb4dfa 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java @@ -25,10 +25,10 @@ import java.io.OutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.io.compress.CodecPool; import org.apache.hadoop.io.compress.CompressionCodec; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/CipherProvider.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/CipherProvider.java index 6deb365..5a475cc 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/CipherProvider.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/CipherProvider.java @@ -16,9 +16,9 @@ */ package org.apache.hadoop.hbase.io.crypto; +import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.conf.Configurable; /** * An CipherProvider contributes support for various cryptographic diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Context.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Context.java index 31cca0e..1e2881e 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Context.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Context.java @@ -18,11 +18,11 @@ package org.apache.hadoop.hbase.io.crypto; import java.security.Key; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.util.MD5Hash; import com.google.common.base.Preconditions; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/DefaultCipherProvider.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/DefaultCipherProvider.java index 961fbae..4f2aebe 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/DefaultCipherProvider.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/DefaultCipherProvider.java @@ -16,10 +16,10 @@ */ package org.apache.hadoop.hbase.io.crypto; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.io.crypto.aes.AES; /** diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java index 85d6eb5..2a3c337 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java @@ -35,11 +35,11 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.util.ReflectionUtils; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/KeyStoreKeyProvider.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/KeyStoreKeyProvider.java index 0e5f36e..62167d6 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/KeyStoreKeyProvider.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/KeyStoreKeyProvider.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.io.crypto; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; import java.net.URLDecoder; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CompressionState.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CompressionState.java index 48ae788..5ac5d2e 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CompressionState.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CompressionState.java @@ -18,8 +18,8 @@ package org.apache.hadoop.hbase.io.encoding; import java.nio.ByteBuffer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.ByteBufferUtils; /** diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.java index 3baebc2..b26b486 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.java @@ -21,12 +21,12 @@ import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.KeyValue.KVComparator; +import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.WritableUtils; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.java index 0e85380..872c22c 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.java @@ -21,9 +21,9 @@ import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue.KVComparator; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.hfile.HFileContext; /** diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.java index c39822f..5aa2373 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.java @@ -21,12 +21,12 @@ import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.KeyValue.KVComparator; +import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java index d83c0b7..1f7f8fa 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java @@ -26,10 +26,10 @@ import java.nio.ByteBuffer; import java.util.Iterator; import org.apache.commons.lang.NotImplementedException; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.compress.Compression.Algorithm; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.util.ByteBufferUtils; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodingState.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodingState.java index 3adc548..a333a15 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodingState.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodingState.java @@ -18,8 +18,8 @@ */ package org.apache.hadoop.hbase.io.encoding; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Keeps track of the encoding state. diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java index 94069bf..5bff66a 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java @@ -21,12 +21,12 @@ import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.KeyValue.KVComparator; +import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java index 8ff71a9..51746ac 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java @@ -21,12 +21,12 @@ import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.KVComparator; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java index 83fe701..ce8b71a 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java @@ -16,8 +16,8 @@ * limitations under the License. */ package org.apache.hadoop.hbase.io.hfile; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.HeapSize; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.crypto.Encryption; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java index 9a4234a..5c5d75f 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hbase.io.hfile; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.compress.Compression.Algorithm; import org.apache.hadoop.hbase.io.crypto.Encryption; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/HeapMemorySizeUtil.java hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/HeapMemorySizeUtil.java index f464db9..250a984 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/HeapMemorySizeUtil.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/HeapMemorySizeUtil.java @@ -22,9 +22,9 @@ import java.lang.management.MemoryUsage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.classification.InterfaceAudience; @InterfaceAudience.Private public class HeapMemorySizeUtil { diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java index 901c57c..5f316f2 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java @@ -24,8 +24,8 @@ import java.lang.reflect.UndeclaredThrowableException; import java.security.PrivilegedAction; import java.security.PrivilegedExceptionAction; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Methods; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapreduce.Job; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/security/UserProvider.java hbase-common/src/main/java/org/apache/hadoop/hbase/security/UserProvider.java index 82f686f..f2a16ca 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/security/UserProvider.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/security/UserProvider.java @@ -19,9 +19,9 @@ package org.apache.hadoop.hbase.security; import java.io.IOException; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.BaseConfigurable; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.ReflectionUtils; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/types/PBType.java hbase-common/src/main/java/org/apache/hadoop/hbase/types/PBType.java index 91e9524..ecc9c80 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/types/PBType.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/types/PBType.java @@ -17,11 +17,12 @@ */ package org.apache.hadoop.hbase.types; +import org.apache.hadoop.hbase.util.Order; +import org.apache.hadoop.hbase.util.PositionedByteRange; + import com.google.protobuf.CodedInputStream; import com.google.protobuf.CodedOutputStream; import com.google.protobuf.Message; -import org.apache.hadoop.hbase.util.Order; -import org.apache.hadoop.hbase.util.PositionedByteRange; /** * A base-class for {@link DataType} implementations backed by protobuf. See diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/Base64.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/Base64.java index 4f31861..76e2549 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/Base64.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/Base64.java @@ -19,11 +19,6 @@ package org.apache.hadoop.hbase.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; - import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; @@ -43,6 +38,11 @@ import java.io.UnsupportedEncodingException; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; + /** * Encodes and decodes to and from Base64 notation. * diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/ChecksumFactory.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/ChecksumFactory.java index 4fc09e1..cc09c3a 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/ChecksumFactory.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/ChecksumFactory.java @@ -20,9 +20,8 @@ package org.apache.hadoop.hbase.util; import java.io.IOException; -import java.lang.ClassNotFoundException; -import java.util.zip.Checksum; import java.lang.reflect.Constructor; +import java.util.zip.Checksum; /** * Utility class that is used to generate a Checksum object. diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcatenatedLists.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcatenatedLists.java index cf8c191..2180b4d 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcatenatedLists.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcatenatedLists.java @@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.util; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcurrentIndex.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcurrentIndex.java index af39d11..539f33b 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcurrentIndex.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcurrentIndex.java @@ -20,9 +20,6 @@ package org.apache.hadoop.hbase.util; -import com.google.common.base.Supplier; -import com.google.common.collect.Multiset; - import java.util.Comparator; import java.util.ConcurrentModificationException; import java.util.Set; @@ -33,6 +30,9 @@ import java.util.concurrent.ConcurrentSkipListSet; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; +import com.google.common.base.Supplier; +import com.google.common.collect.Multiset; + /** * A simple concurrent map of sets. This is similar in concept to * {@link Multiset}, with the following exceptions: diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/CoprocessorClassLoader.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/CoprocessorClassLoader.java index 7b837af..a3aabf7 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/CoprocessorClassLoader.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/CoprocessorClassLoader.java @@ -35,10 +35,10 @@ import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.io.IOUtils; import com.google.common.base.Preconditions; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/DynamicClassLoader.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/DynamicClassLoader.java index e434558..81e4483 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/DynamicClassLoader.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/DynamicClassLoader.java @@ -25,11 +25,11 @@ import java.util.HashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.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.classification.InterfaceAudience; /** * This is a class loader that can load classes dynamically from new diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/Hash.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/Hash.java index a7d5843..82cf5c4 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/Hash.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/Hash.java @@ -19,9 +19,9 @@ package org.apache.hadoop.hbase.util; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.conf.Configuration; /** * This class represents a common API for hashing functions. diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/PrettyPrinter.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/PrettyPrinter.java index cf11de1..0e50dfb 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/PrettyPrinter.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/PrettyPrinter.java @@ -19,9 +19,9 @@ package org.apache.hadoop.hbase.util; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.HConstants; @InterfaceAudience.Public @InterfaceStability.Evolving diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java index f21ff31..79c8ac3 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java @@ -18,13 +18,13 @@ package org.apache.hadoop.hbase.util; -import org.apache.commons.logging.LogFactory; import java.io.PrintWriter; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.VersionAnnotation; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.VersionAnnotation; -import org.apache.commons.logging.Log; /** * This class finds the package info for hbase and the VersionAnnotation diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java index 859c07b..52bc4e0 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; import java.util.Random; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.Tag; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.io.WritableUtils; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java index 18368a4..5d4d941 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java @@ -22,8 +22,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.regex.Pattern; -import org.apache.hadoop.hbase.ClassFinder.ClassFilter; -import org.apache.hadoop.hbase.ClassFinder.FileNameFilter; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runners.Suite; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java index 18ca35c..3cae4d2 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java @@ -25,10 +25,10 @@ import java.util.UUID; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; /** * Common helpers for testing HBase that do not depend on specific server/etc. things. diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/ResourceChecker.java hbase-common/src/test/java/org/apache/hadoop/hbase/ResourceChecker.java index e56dea8..539aea3 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/ResourceChecker.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/ResourceChecker.java @@ -19,11 +19,12 @@ package org.apache.hadoop.hbase; +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.*; - /** * Utility class to check the resources: * - log them before and after each test method diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/ResourceCheckerJUnitListener.java hbase-common/src/test/java/org/apache/hadoop/hbase/ResourceCheckerJUnitListener.java index 26f63f8..6264a5e 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/ResourceCheckerJUnitListener.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/ResourceCheckerJUnitListener.java @@ -29,9 +29,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.apache.hadoop.hbase.ResourceChecker.Phase; -import org.junit.runner.notification.RunListener; - import org.apache.hadoop.hbase.util.JVM; +import org.junit.runner.notification.RunListener; /** * Listen to the test progress and check the usage of: diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java index 468333d..3453baf 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java @@ -25,8 +25,8 @@ import junit.framework.Assert; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * A class that provides a standard waitFor pattern diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java index 028e78e..922de6f 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java @@ -17,7 +17,9 @@ */ package org.apache.hadoop.hbase.codec; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java index 14926f1..30f2f00 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java @@ -32,9 +32,9 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java index 78fa733..007647a 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java @@ -32,9 +32,9 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java index fcdb750..841c468 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java @@ -27,10 +27,10 @@ import java.util.ArrayList; import java.util.List; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.testclassification.MiscTests; -import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.io.util.LRUDictionary; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/KeyProviderForTesting.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/KeyProviderForTesting.java index 9b45d09..781924b 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/KeyProviderForTesting.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/KeyProviderForTesting.java @@ -17,6 +17,7 @@ package org.apache.hadoop.hbase.io.crypto; import java.security.Key; + import javax.crypto.spec.SecretKeySpec; /** diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java index b7d6322..fdb9448 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java @@ -16,7 +16,9 @@ */ package org.apache.hadoop.hbase.io.crypto; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.io.InputStream; @@ -27,10 +29,9 @@ import java.util.Arrays; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.io.crypto.aes.AES; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.io.crypto.aes.AES; - import org.junit.Test; import org.junit.experimental.categories.Category; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java index 5a7222d..d36333e 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java @@ -16,7 +16,8 @@ */ package org.apache.hadoop.hbase.io.crypto; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java index 4e60082..dab03f2 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java @@ -25,10 +25,9 @@ import java.security.Key; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.io.crypto.aes.AES; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.io.crypto.aes.AES; - import org.junit.Test; import org.junit.experimental.categories.Category; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java index 68424bb..ea8879b 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java @@ -16,7 +16,9 @@ */ package org.apache.hadoop.hbase.io.crypto.aes; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -34,14 +36,13 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.testclassification.MiscTests; -import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.io.crypto.Cipher; import org.apache.hadoop.hbase.io.crypto.DefaultCipherProvider; import org.apache.hadoop.hbase.io.crypto.Encryption; import org.apache.hadoop.hbase.io.crypto.Encryptor; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; - import org.junit.Test; import org.junit.experimental.categories.Category; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java index 90da280..9569ba8 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java @@ -18,7 +18,9 @@ package org.apache.hadoop.hbase.io.util; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.math.BigInteger; import java.util.Arrays; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java index bd4854e..09ef707 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.TreeMap; import junit.framework.TestCase; + import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.experimental.categories.Category; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java index 34326d6..a6b7cc5 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java @@ -21,9 +21,9 @@ import java.util.ArrayList; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.Tag; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java index 17d5493..fd4baf5 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java @@ -18,6 +18,11 @@ */ package org.apache.hadoop.hbase.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -29,8 +34,6 @@ import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; -import static org.junit.Assert.*; - @Category({MiscTests.class, SmallTests.class}) public class TestConcatenatedLists { @Test diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java index 09927f2..4542cbd 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java @@ -18,13 +18,15 @@ */ package org.apache.hadoop.hbase.util; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; -import static org.junit.Assert.*; - @Category({MiscTests.class, SmallTests.class}) public class TestDrainBarrier { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java index ee087ef..3c7a8dd 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java @@ -18,19 +18,18 @@ */ package org.apache.hadoop.hbase.util; -import org.apache.hadoop.hbase.testclassification.MediumTests; -import org.apache.hadoop.hbase.testclassification.MiscTests; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.verify; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.junit.Test; +import org.junit.experimental.categories.Category; @Category({MiscTests.class, MediumTests.class}) public class TestEnvironmentEdgeManager { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestFastLongHistogram.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestFastLongHistogram.java index a6078ab..f5848f3 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestFastLongHistogram.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestFastLongHistogram.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hbase.util; import java.util.Arrays; import java.util.Random; -import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java index bb05900..9bb8a04 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java @@ -18,14 +18,14 @@ package org.apache.hadoop.hbase.util; +import java.util.concurrent.locks.ReentrantLock; + import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.util.concurrent.locks.ReentrantLock; - @Category({MiscTests.class, SmallTests.class}) public class TestKeyLocker { @Test diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java index e6d154d..2f16ee8 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java @@ -18,6 +18,8 @@ package org.apache.hadoop.hbase.util; +import java.util.Properties; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.testclassification.MiscTests; @@ -25,8 +27,6 @@ import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.util.Properties; - /** * This test is there to dump the properties. It allows to detect possible env issues when diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java index e8a0d05..a628e98 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java @@ -20,6 +20,8 @@ package org.apache.hadoop.hbase.util; import static org.junit.Assert.assertTrue; +import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.testclassification.MiscTests; @@ -27,8 +29,6 @@ import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.util.concurrent.atomic.AtomicBoolean; - @Category({MiscTests.class, SmallTests.class}) public class TestThreads { private static final Log LOG = LogFactory.getLog(TestThreads.class);