From b9f44bcfe7dd74847bf0c06c083a851b65d278d0 Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Sun, 24 Dec 2017 13:27:25 +0100 Subject: [PATCH] HBASE-19609 Fixed Checkstyle errors in hbase-metrics and enabled Checkstyle to fail on violations --- hbase-metrics/pom.xml | 16 ++++++++++++++++ .../hadoop/hbase/metrics/impl/CounterImpl.java | 2 +- .../hbase/metrics/impl/DropwizardMeter.java | 4 ++-- .../hbase/metrics/impl/FastLongHistogram.java | 4 ++-- .../hadoop/hbase/metrics/impl/HistogramImpl.java | 4 +--- .../hbase/metrics/impl/MetricRegistriesImpl.java | 4 +--- .../metrics/impl/MetricRegistryFactoryImpl.java | 4 +--- .../hbase/metrics/impl/MetricRegistryImpl.java | 2 +- .../hbase/metrics/impl/RefCountingMap.java | 4 +--- .../hadoop/hbase/metrics/impl/TimerImpl.java | 2 +- .../hbase/metrics/impl/TestDropwizardMeter.java | 4 ++-- .../hbase/metrics/impl/TestRefCountingMap.java | 8 +++----- 12 files changed, 32 insertions(+), 26 deletions(-) diff --git a/hbase-metrics/pom.xml b/hbase-metrics/pom.xml index 0f5ac2adcdf..3107d753220 100644 --- a/hbase-metrics/pom.xml +++ b/hbase-metrics/pom.xml @@ -68,6 +68,22 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + + + checkstyle + validate + + check + + + true + + + + diff --git a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/CounterImpl.java b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/CounterImpl.java index 848aa5b25a2..8021c068939 100644 --- a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/CounterImpl.java +++ b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/CounterImpl.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.metrics.impl; import java.util.concurrent.atomic.LongAdder; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.metrics.Counter; +import org.apache.yetus.audience.InterfaceAudience; /** * Custom implementation of {@link org.apache.hadoop.hbase.metrics.Counter} using LongAdder. diff --git a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/DropwizardMeter.java b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/DropwizardMeter.java index 8b3bb80edbb..b5c52cf840c 100644 --- a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/DropwizardMeter.java +++ b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/DropwizardMeter.java @@ -17,12 +17,12 @@ */ package org.apache.hadoop.hbase.metrics.impl; +import com.codahale.metrics.Meter; + import java.util.Objects; import org.apache.yetus.audience.InterfaceAudience; -import com.codahale.metrics.Meter; - /** * Dropwizard metrics implementation of {@link org.apache.hadoop.hbase.metrics.Meter}. */ diff --git a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/FastLongHistogram.java b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/FastLongHistogram.java index a341d21abff..69f4ae54fb2 100644 --- a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/FastLongHistogram.java +++ b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/FastLongHistogram.java @@ -22,10 +22,10 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.LongAdder; import java.util.stream.Stream; -import org.apache.yetus.audience.InterfaceAudience; -import org.apache.yetus.audience.InterfaceStability; import org.apache.hadoop.hbase.metrics.Snapshot; import org.apache.hadoop.hbase.util.AtomicUtils; +import org.apache.yetus.audience.InterfaceAudience; +import org.apache.yetus.audience.InterfaceStability; /** * FastLongHistogram is a thread-safe class that estimate distribution of data and computes the diff --git a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/HistogramImpl.java b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/HistogramImpl.java index 910d1cd9cb4..6871f7e7b8b 100644 --- a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/HistogramImpl.java +++ b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/HistogramImpl.java @@ -16,13 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.hadoop.hbase.metrics.impl; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.metrics.Histogram; import org.apache.hadoop.hbase.metrics.Snapshot; +import org.apache.yetus.audience.InterfaceAudience; /** * Custom histogram implementation based on FastLongHistogram. Dropwizard-based histograms are diff --git a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistriesImpl.java b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistriesImpl.java index 28bdbb47245..d72c68f61e6 100644 --- a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistriesImpl.java +++ b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistriesImpl.java @@ -16,8 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.hadoop.hbase.metrics.impl; import java.util.Collection; @@ -25,11 +23,11 @@ import java.util.Collections; import java.util.Optional; import java.util.Set; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.metrics.MetricRegistries; import org.apache.hadoop.hbase.metrics.MetricRegistry; import org.apache.hadoop.hbase.metrics.MetricRegistryFactory; import org.apache.hadoop.hbase.metrics.MetricRegistryInfo; +import org.apache.yetus.audience.InterfaceAudience; /** * Implementation of MetricRegistries that does ref-counting. diff --git a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistryFactoryImpl.java b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistryFactoryImpl.java index e5dbc7404c1..6f9e16366aa 100644 --- a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistryFactoryImpl.java +++ b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistryFactoryImpl.java @@ -16,14 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.hadoop.hbase.metrics.impl; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.metrics.MetricRegistry; import org.apache.hadoop.hbase.metrics.MetricRegistryFactory; import org.apache.hadoop.hbase.metrics.MetricRegistryInfo; +import org.apache.yetus.audience.InterfaceAudience; @InterfaceAudience.Private public class MetricRegistryFactoryImpl implements MetricRegistryFactory { diff --git a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistryImpl.java b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistryImpl.java index c5dc8491226..03c669fee0e 100644 --- a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistryImpl.java +++ b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/MetricRegistryImpl.java @@ -22,7 +22,6 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.metrics.Counter; import org.apache.hadoop.hbase.metrics.Gauge; import org.apache.hadoop.hbase.metrics.Histogram; @@ -33,6 +32,7 @@ import org.apache.hadoop.hbase.metrics.MetricRegistryInfo; import org.apache.hadoop.hbase.metrics.MetricSet; import org.apache.hadoop.hbase.metrics.Timer; import org.apache.hadoop.hbase.util.CollectionUtils; +import org.apache.yetus.audience.InterfaceAudience; /** * Custom implementation of {@link MetricRegistry}. diff --git a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/RefCountingMap.java b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/RefCountingMap.java index 567ffa8cb3d..63131a100e9 100644 --- a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/RefCountingMap.java +++ b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/RefCountingMap.java @@ -16,8 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.hadoop.hbase.metrics.impl; import java.util.Collection; @@ -69,7 +67,7 @@ class RefCountingMap { * @return the value associated with the specified key or null if key is removed from map. */ V remove(K k) { - Payload p = map.computeIfPresent(k, (k1, v) -> --v.refCount <= 0 ? null : v ); + Payload p = map.computeIfPresent(k, (k1, v) -> --v.refCount <= 0 ? null : v); return p == null ? null : p.v; } diff --git a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/TimerImpl.java b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/TimerImpl.java index 495bc78de97..03a8c65915e 100644 --- a/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/TimerImpl.java +++ b/hbase-metrics/src/main/java/org/apache/hadoop/hbase/metrics/impl/TimerImpl.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.metrics.impl; import java.util.concurrent.TimeUnit; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.metrics.Timer; +import org.apache.yetus.audience.InterfaceAudience; /** * Custom implementation of {@link Timer}. diff --git a/hbase-metrics/src/test/java/org/apache/hadoop/hbase/metrics/impl/TestDropwizardMeter.java b/hbase-metrics/src/test/java/org/apache/hadoop/hbase/metrics/impl/TestDropwizardMeter.java index 55f5df3e6c7..e48d0519d71 100644 --- a/hbase-metrics/src/test/java/org/apache/hadoop/hbase/metrics/impl/TestDropwizardMeter.java +++ b/hbase-metrics/src/test/java/org/apache/hadoop/hbase/metrics/impl/TestDropwizardMeter.java @@ -17,14 +17,14 @@ */ package org.apache.hadoop.hbase.metrics.impl; +import com.codahale.metrics.Meter; + import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import com.codahale.metrics.Meter; - /** * Test class for {@link DropwizardMeter}. */ diff --git a/hbase-metrics/src/test/java/org/apache/hadoop/hbase/metrics/impl/TestRefCountingMap.java b/hbase-metrics/src/test/java/org/apache/hadoop/hbase/metrics/impl/TestRefCountingMap.java index d4c249c2155..a776ccd0901 100644 --- a/hbase-metrics/src/test/java/org/apache/hadoop/hbase/metrics/impl/TestRefCountingMap.java +++ b/hbase-metrics/src/test/java/org/apache/hadoop/hbase/metrics/impl/TestRefCountingMap.java @@ -16,8 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.hadoop.hbase.metrics.impl; import static org.junit.Assert.assertEquals; @@ -135,7 +133,7 @@ public class TestRefCountingMap { Set keys = map.keySet(); assertEquals(3, keys.size()); - Lists.newArrayList("foo", "bar", "baz").stream().forEach( v -> assertTrue(keys.contains(v))); + Lists.newArrayList("foo", "bar", "baz").stream().forEach(v -> assertTrue(keys.contains(v))); } @Test @@ -148,7 +146,7 @@ public class TestRefCountingMap { Collection values = map.values(); assertEquals(3, values.size()); - Lists.newArrayList("foovalue", "foovalue3", "foovalue4").stream().forEach( - v -> assertTrue(values.contains(v))); + Lists.newArrayList("foovalue", "foovalue3", "foovalue4").stream() + .forEach(v -> assertTrue(values.contains(v))); } }