hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject hbase git commit: HBASE-19606 Fixed Checkstyle errors in hbase-hadoop-compat and enabled Checkstyle to fail on violations
Date Tue, 02 Jan 2018 22:55:23 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 6011641c3 -> 741466a88


HBASE-19606 Fixed Checkstyle errors in hbase-hadoop-compat and enabled Checkstyle to fail
on violations


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/741466a8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/741466a8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/741466a8

Branch: refs/heads/master
Commit: 741466a882942d81f52b3c559e7d010ee8ba3ed5
Parents: 6011641
Author: Jan Hentschel <jan.hentschel@ultratendency.com>
Authored: Sat Dec 23 18:34:57 2017 +0100
Committer: Jan Hentschel <jan.hentschel@ultratendency.com>
Committed: Wed Jan 3 01:50:08 2018 +0300

----------------------------------------------------------------------
 .../resources/hbase/checkstyle-suppressions.xml   |  2 +-
 hbase-hadoop-compat/pom.xml                       | 18 +++++++++++++++++-
 .../master/MetricsAssignmentManagerSource.java    |  3 ++-
 .../hadoop/hbase/master/MetricsMasterSource.java  |  3 ++-
 .../MetricsHeapMemoryManagerSource.java           |  3 ++-
 .../regionserver/MetricsRegionServerSource.java   |  2 +-
 .../hbase/regionserver/MetricsRegionWrapper.java  | 14 ++++++++------
 .../MetricsReplicationSourceSource.java           |  4 +++-
 .../hadoop/hbase/rest/MetricsRESTSource.java      |  2 +-
 .../hbase/thrift/MetricsThriftServerSource.java   |  2 +-
 .../thrift/MetricsThriftServerSourceFactory.java  |  6 +++---
 .../hbase/zookeeper/MetricsZooKeeperSource.java   |  9 ++++++---
 .../apache/hadoop/metrics2/MetricHistogram.java   |  2 +-
 .../hbase/TestCompatibilitySingletonFactory.java  |  9 ++++-----
 .../master/TestMetricsMasterSourceFactory.java    |  2 +-
 .../TestMetricsRegionServerSourceFactory.java     |  3 +--
 .../regionserver/wal/TestMetricsWALSource.java    |  2 +-
 .../TestMetricsReplicationSourceFactory.java      |  3 +--
 .../hadoop/hbase/rest/TestMetricsRESTSource.java  |  6 +-----
 .../TestMetricsThriftServerSourceFactory.java     |  3 +--
 20 files changed, 58 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
----------------------------------------------------------------------
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
index b9c9b21..07261bf 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
@@ -35,5 +35,5 @@
   <suppress checks="." files=".*/generated-jamon/.*\.java"/>
   <suppress checks="MagicNumberCheck" files=".*/src/test/.*\.java"/>
   <suppress checks="VisibilityModifier" files=".*/src/test/.*\.java"/>
-  <suppress checks="InterfaceIsTypeCheck" files="RSGroupableBalancer.java"/>
+  <suppress checks="InterfaceIsTypeCheck" files=".*/src/main/.*\.java"/>
 </suppressions>

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml
index 08ac22d..512a466 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@@ -56,7 +56,23 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
         </plugin>
-        </plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>checkstyle</id>
+              <phase>validate</phase>
+              <goals>
+                <goal>check</goal>
+              </goals>
+              <configuration>
+                <failOnViolation>true</failOnViolation>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
       <pluginManagement>
         <plugins>
           <!--This plugin's configuration is used to store Eclipse m2e settings

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSource.java
index 4e4a9e0..890c67a 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSource.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSource.java
@@ -52,7 +52,8 @@ public interface MetricsAssignmentManagerSource extends BaseSource {
   String RIT_COUNT_DESC = "Current number of Regions In Transition (Gauge).";
   String RIT_COUNT_OVER_THRESHOLD_DESC =
       "Current number of Regions In Transition over threshold time (Gauge).";
-  String RIT_OLDEST_AGE_DESC = "Timestamp in milliseconds of the oldest Region In Transition
(Gauge).";
+  String RIT_OLDEST_AGE_DESC =
+      "Timestamp in milliseconds of the oldest Region In Transition (Gauge).";
   String RIT_DURATION_DESC =
       "Total durations in milliseconds for all Regions in Transition (Histogram).";
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java
index d187bb1..b1c47ec 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java
@@ -65,7 +65,8 @@ public interface MetricsMasterSource extends BaseSource {
   String CLUSTER_REQUESTS_NAME = "clusterRequests";
   String MASTER_ACTIVE_TIME_DESC = "Master Active Time";
   String MASTER_START_TIME_DESC = "Master Start Time";
-  String MASTER_FINISHED_INITIALIZATION_TIME_DESC = "Timestamp when Master has finished initializing";
+  String MASTER_FINISHED_INITIALIZATION_TIME_DESC =
+          "Timestamp when Master has finished initializing";
   String AVERAGE_LOAD_DESC = "AverageLoad";
   String LIVE_REGION_SERVERS_DESC = "Names of live RegionServers";
   String NUMBER_OF_REGION_SERVERS_DESC = "Number of RegionServers";

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java
index 532c5af..a36fb90 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java
@@ -123,7 +123,8 @@ public interface MetricsHeapMemoryManagerSource extends BaseSource {
   // Counters
   String DO_NOTHING_COUNTER_NAME = "tunerDoNothingCounter";
   String DO_NOTHING_COUNTER_DESC =
-      "The number of times that tuner neither expands memstore global size limit nor expands
blockcache max size";
+      "The number of times that tuner neither expands memstore global size limit nor expands
" +
+              "blockcache max size";
   String ABOVE_HEAP_LOW_WATERMARK_COUNTER_NAME = "aboveHeapOccupancyLowWaterMarkCounter";
   String ABOVE_HEAP_LOW_WATERMARK_COUNTER_DESC =
       "The number of times that heap occupancy percent is above low watermark";

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
index 3dd4445..168c91f 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
@@ -55,7 +55,7 @@ public interface MetricsRegionServerSource extends BaseSource, JvmPauseMonitorSo
 
   /**
    * Update the PutBatch time histogram if a batch contains a Put op
-   * @param t
+   * @param t time it took
    */
   void updatePutBatch(long t);
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java
index 371f9ba..2a03f66 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java
@@ -118,26 +118,28 @@ public interface MetricsRegionWrapper {
   long getNumCompactionsFailed();
 
   /**
-   * @return the total number of compactions that are currently queued(or being executed)
at point in
-   *  time
+   * @return the total number of compactions that are currently queued(or being executed)
at point
+   *         in time
    */
   long getNumCompactionsQueued();
 
   /**
-   * @return the total number of flushes currently queued(being executed) for this region
at point in
-   *  time
+   * @return the total number of flushes currently queued(being executed) for this region
at point
+   *         in time
    */
   long getNumFlushesQueued();
 
   /**
+   * Note that this metric is updated periodically and hence might miss some data points.
+   *
    * @return the max number of compactions queued for this region
-   * Note that this metric is updated periodically and hence might miss some data points
    */
   long getMaxCompactionQueueSize();
 
   /**
+   * Note that this metric is updated periodically and hence might miss some data points.
+   *
    * @return the max number of flushes queued for this region
-   * Note that this metric is updated periodically and hence might miss some data points
    */
   long getMaxFlushQueueSize();
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
index 9075a68..e9ca5b7 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
@@ -26,8 +26,10 @@ public interface MetricsReplicationSourceSource extends BaseSource {
   public static final String SOURCE_AGE_OF_LAST_SHIPPED_OP = "source.ageOfLastShippedOp";
   public static final String SOURCE_SHIPPED_BATCHES = "source.shippedBatches";
 
+  /**
+   * @deprecated Use {@link #SOURCE_SHIPPED_BYTES} instead
+   */
   @Deprecated
-  /** @deprecated Use SOURCE_SHIPPED_BYTES instead */
   public static final String SOURCE_SHIPPED_KBS = "source.shippedKBs";
   public static final String SOURCE_SHIPPED_BYTES = "source.shippedBytes";
   public static final String SOURCE_SHIPPED_OPS = "source.shippedOps";

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSource.java
index a5101e0..4234dfd 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSource.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSource.java
@@ -84,7 +84,7 @@ public interface MetricsRESTSource extends BaseSource, JvmPauseMonitorSource
{
   /**
    * Increment the number of successful Delete requests.
    *
-   * @param inc
+   * @param inc number of successful delete requests
    */
   void incrementSucessfulDeleteRequests(int inc);
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java
index 276a40c..5acb765 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java
@@ -36,7 +36,7 @@ public interface MetricsThriftServerSource extends ExceptionTrackingSource,
JvmP
 
   /**
    * Add how long an operation was in the queue.
-   * @param time
+   * @param time the time to add
    */
   void incTimeInQueue(long time);
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.java
index a4608b5..6c81451 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.java
@@ -18,9 +18,10 @@
 
 package org.apache.hadoop.hbase.thrift;
 
-/** Factory that will be used to create metrics sources for the two diffent types of thrift
servers. */
+/**
+ * Factory that will be used to create metrics sources for the two diffent types of thrift
servers.
+ */
 public interface MetricsThriftServerSourceFactory {
-
   String METRICS_NAME = "Thrift";
   String METRICS_DESCRIPTION = "Thrift Server Metrics";
   String THRIFT_ONE_METRICS_CONTEXT = "thrift-one";
@@ -33,5 +34,4 @@ public interface MetricsThriftServerSourceFactory {
 
   /** Create a Source for a thrift two server */
   MetricsThriftServerSource createThriftTwoSource();
-
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.java
index 7a40464..506783d 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.java
@@ -49,15 +49,18 @@ public interface MetricsZooKeeperSource extends BaseSource {
   String EXCEPTION_CONNECTIONLOSS = "CONNECTIONLOSS Exception";
   String EXCEPTION_CONNECTIONLOSS_DESC = "Number of failed ops due to a CONNECTIONLOSS exception.";
   String EXCEPTION_DATAINCONSISTENCY = "DATAINCONSISTENCY Exception";
-  String EXCEPTION_DATAINCONSISTENCY_DESC = "Number of failed ops due to a DATAINCONSISTENCY
exception.";
+  String EXCEPTION_DATAINCONSISTENCY_DESC =
+          "Number of failed ops due to a DATAINCONSISTENCY exception.";
   String EXCEPTION_INVALIDACL = "INVALIDACL Exception";
   String EXCEPTION_INVALIDACL_DESC = "Number of failed ops due to an INVALIDACL exception";
   String EXCEPTION_NOAUTH = "NOAUTH Exception";
   String EXCEPTION_NOAUTH_DESC = "Number of failed ops due to a NOAUTH exception.";
   String EXCEPTION_OPERATIONTIMEOUT = "OPERATIONTIMEOUT Exception";
-  String EXCEPTION_OPERATIONTIMEOUT_DESC = "Number of failed ops due to an OPERATIONTIMEOUT
exception.";
+  String EXCEPTION_OPERATIONTIMEOUT_DESC =
+          "Number of failed ops due to an OPERATIONTIMEOUT exception.";
   String EXCEPTION_RUNTIMEINCONSISTENCY = "RUNTIMEINCONSISTENCY Exception";
-  String EXCEPTION_RUNTIMEINCONSISTENCY_DESC = "Number of failed ops due to a RUNTIMEINCONSISTENCY
exception.";
+  String EXCEPTION_RUNTIMEINCONSISTENCY_DESC =
+          "Number of failed ops due to a RUNTIMEINCONSISTENCY exception.";
   String EXCEPTION_SESSIONEXPIRED = "SESSIONEXPIRED Exception";
   String EXCEPTION_SESSIONEXPIRED_DESC = "Number of failed ops due to a SESSIONEXPIRED exception.";
   String EXCEPTION_SYSTEMERROR = "SYSTEMERROR Exception";

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricHistogram.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricHistogram.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricHistogram.java
index 9d24a23..1715255 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricHistogram.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricHistogram.java
@@ -40,7 +40,7 @@ public interface MetricHistogram {
 
   /**
    * Add a single value to a histogram's stream of values.
-   * @param value
+   * @param value the value to add
    */
   void add(long value);
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/TestCompatibilitySingletonFactory.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/TestCompatibilitySingletonFactory.java
b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/TestCompatibilitySingletonFactory.java
index 168f6c7..f7462b0 100644
--- a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/TestCompatibilitySingletonFactory.java
+++ b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/TestCompatibilitySingletonFactory.java
@@ -18,6 +18,9 @@
 
 package org.apache.hadoop.hbase;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -26,15 +29,11 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.testclassification.MetricsTests;
-
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
 @Category({MetricsTests.class, SmallTests.class})
 public class TestCompatibilitySingletonFactory {
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceFactory.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceFactory.java
b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceFactory.java
index 6e2961f..09186c9 100644
--- a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceFactory.java
+++ b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceFactory.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.hbase.master;
 
 import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.testclassification.MetricsTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServerSourceFactory.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServerSourceFactory.java
b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServerSourceFactory.java
index fbf1994..b59baf9 100644
--- a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServerSourceFactory.java
+++ b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServerSourceFactory.java
@@ -19,9 +19,8 @@
 package org.apache.hadoop.hbase.regionserver;
 
 import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
-import org.apache.hadoop.hbase.regionserver.MetricsRegionServerSourceFactory;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.testclassification.MetricsTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestMetricsWALSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestMetricsWALSource.java
b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestMetricsWALSource.java
index aabfdfe..b7538ff 100644
--- a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestMetricsWALSource.java
+++ b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestMetricsWALSource.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.hbase.regionserver.wal;
 
 import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.testclassification.MetricsTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestMetricsReplicationSourceFactory.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestMetricsReplicationSourceFactory.java
b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestMetricsReplicationSourceFactory.java
index 3a8bb89..808e34f 100644
--- a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestMetricsReplicationSourceFactory.java
+++ b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestMetricsReplicationSourceFactory.java
@@ -19,9 +19,8 @@
 package org.apache.hadoop.hbase.replication.regionserver;
 
 import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
-import org.apache.hadoop.hbase.replication.regionserver.MetricsReplicationSource;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.testclassification.MetricsTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/rest/TestMetricsRESTSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/rest/TestMetricsRESTSource.java
b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/rest/TestMetricsRESTSource.java
index ee2f164..28a70f4 100644
--- a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/rest/TestMetricsRESTSource.java
+++ b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/rest/TestMetricsRESTSource.java
@@ -19,9 +19,8 @@
 package org.apache.hadoop.hbase.rest;
 
 import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
-import org.apache.hadoop.hbase.rest.MetricsRESTSource;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.testclassification.MetricsTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -30,12 +29,9 @@ import org.junit.experimental.categories.Category;
  */
 @Category({MetricsTests.class, SmallTests.class})
 public class TestMetricsRESTSource {
-
-
   @Test(expected=RuntimeException.class)
   public void testGetInstanceNoHadoopCompat() throws Exception {
     //This should throw an exception because there is no compat lib on the class path.
     CompatibilitySingletonFactory.getInstance(MetricsRESTSource.class);
   }
-
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/741466a8/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/thrift/TestMetricsThriftServerSourceFactory.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/thrift/TestMetricsThriftServerSourceFactory.java
b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/thrift/TestMetricsThriftServerSourceFactory.java
index f33135e..78aa736 100644
--- a/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/thrift/TestMetricsThriftServerSourceFactory.java
+++ b/hbase-hadoop-compat/src/test/java/org/apache/hadoop/hbase/thrift/TestMetricsThriftServerSourceFactory.java
@@ -19,9 +19,8 @@
 package org.apache.hadoop.hbase.thrift;
 
 import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.testclassification.MetricsTests;
-import org.apache.hadoop.hbase.thrift.MetricsThriftServerSourceFactory;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 


Mime
View raw message