From 9b32e9977cbd872378b25e6b87b5e2eeab1af70d Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Sat, 23 Dec 2017 18:34:57 +0100 Subject: [PATCH] HBASE-19606 Fixed Checkstyle errors in hbase-hadoop-compat and enabled Checkstyle to fail on violations --- .../main/resources/hbase/checkstyle-suppressions.xml | 1 + hbase-hadoop-compat/pom.xml | 18 +++++++++++++++++- .../hbase/master/MetricsAssignmentManagerSource.java | 3 ++- .../hadoop/hbase/master/MetricsMasterSource.java | 3 ++- .../regionserver/MetricsHeapMemoryManagerSource.java | 3 ++- .../hbase/regionserver/MetricsRegionServerSource.java | 2 +- .../hbase/regionserver/MetricsRegionWrapper.java | 14 ++++++++------ .../regionserver/MetricsReplicationSourceSource.java | 4 +++- .../apache/hadoop/hbase/rest/MetricsRESTSource.java | 2 +- .../hadoop/hbase/thrift/MetricsThriftServerSource.java | 2 +- .../hbase/thrift/MetricsThriftServerSourceFactory.java | 6 +++--- .../hadoop/hbase/zookeeper/MetricsZooKeeperSource.java | 9 ++++++--- .../org/apache/hadoop/metrics2/MetricHistogram.java | 2 +- .../hbase/TestCompatibilitySingletonFactory.java | 9 ++++----- .../hbase/master/TestMetricsMasterSourceFactory.java | 2 +- .../TestMetricsRegionServerSourceFactory.java | 3 +-- .../hbase/regionserver/wal/TestMetricsWALSource.java | 2 +- .../TestMetricsReplicationSourceFactory.java | 3 +-- .../hadoop/hbase/rest/TestMetricsRESTSource.java | 6 +----- .../thrift/TestMetricsThriftServerSourceFactory.java | 3 +-- 20 files changed, 58 insertions(+), 39 deletions(-) diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml index 1ecae86f4e..07261bf35c 100644 --- a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml +++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml @@ -35,4 +35,5 @@ + diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml index 08ac22dd87..512a4666f8 100644 --- a/hbase-hadoop-compat/pom.xml +++ b/hbase-hadoop-compat/pom.xml @@ -56,7 +56,23 @@ org.apache.maven.plugins maven-source-plugin - + + org.apache.maven.plugins + maven-checkstyle-plugin + + + checkstyle + validate + + check + + + true + + + + +