From 023fab2eb93d62dce3f527f3ede9932a2c09025f Mon Sep 17 00:00:00 2001 From: Elliott Neil Clark Date: Tue, 10 Dec 2013 17:17:16 -0800 Subject: [PATCH] HBASE-10124 Make Sub Classes Static When Possible --- .../hbase/regionserver/TestMetricsRegionSourceImpl.java | 2 +- .../hbase/regionserver/TestMetricsRegionSourceImpl.java | 2 +- .../org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java | 14 +++++++------- .../hadoop/hbase/mapreduce/TableSnapshotInputFormat.java | 2 +- .../hadoop/hbase/regionserver/ServerNonceManager.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hbase-hadoop1-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java b/hbase-hadoop1-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java index f313d8d..30beb8a 100644 --- a/hbase-hadoop1-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java +++ b/hbase-hadoop1-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java @@ -48,7 +48,7 @@ public class TestMetricsRegionSourceImpl { CompatibilitySingletonFactory.getInstance(MetricsRegionSource.class); } - class RegionWrapperStub implements MetricsRegionWrapper { + static class RegionWrapperStub implements MetricsRegionWrapper { private String regionName; diff --git a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java index f313d8d..30beb8a 100644 --- a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java +++ b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java @@ -48,7 +48,7 @@ public class TestMetricsRegionSourceImpl { CompatibilitySingletonFactory.getInstance(MetricsRegionSource.class); } - class RegionWrapperStub implements MetricsRegionWrapper { + static class RegionWrapperStub implements MetricsRegionWrapper { private String regionName; diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java index 5646d12..5d2f6ea 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java @@ -328,7 +328,7 @@ public class IntegrationTestMTTR { * * Stores times and trace id. */ - private class TimingResult { + private static class TimingResult { DescriptiveStatistics stats = new DescriptiveStatistics(); ArrayList traces = new ArrayList(10); @@ -366,7 +366,7 @@ public class IntegrationTestMTTR { /** * Base class for actions that need to record the time needed to recover from a failure. */ - public abstract class TimingCallable implements Callable { + static abstract class TimingCallable implements Callable { protected final Future future; public TimingCallable(Future f) { @@ -456,7 +456,7 @@ public class IntegrationTestMTTR { * Callable that will keep putting small amounts of data into a table * until the future supplied returns. It keeps track of the max time. */ - public class PutCallable extends TimingCallable { + static class PutCallable extends TimingCallable { private final HTable table; @@ -484,7 +484,7 @@ public class IntegrationTestMTTR { * Callable that will keep scanning for small amounts of data until the * supplied future returns. Returns the max time taken to scan. */ - public class ScanCallable extends TimingCallable { + static class ScanCallable extends TimingCallable { private final HTable table; public ScanCallable(Future f) throws IOException { @@ -520,7 +520,7 @@ public class IntegrationTestMTTR { /** * Callable that will keep going to the master for cluster status. Returns the max time taken. */ - public class AdminCallable extends TimingCallable { + static class AdminCallable extends TimingCallable { public AdminCallable(Future f) throws IOException { super(f); @@ -547,7 +547,7 @@ public class IntegrationTestMTTR { } - public class ActionCallable implements Callable { + static class ActionCallable implements Callable { private final Action action; public ActionCallable(Action action) { @@ -565,7 +565,7 @@ public class IntegrationTestMTTR { * Callable used to make sure the cluster has some load on it. * This callable uses LoadTest tool to */ - public class LoadCallable implements Callable { + public static class LoadCallable implements Callable { private final Future future; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java index 51eb3da..6192894 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java @@ -185,7 +185,7 @@ public class TableSnapshotInputFormat extends InputFormat { + static class TableSnapshotRegionRecordReader extends RecordReader { private TableSnapshotRegionSplit split; private Scan scan; private Result result = null; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ServerNonceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ServerNonceManager.java index 3f0124a..faf9138 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ServerNonceManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ServerNonceManager.java @@ -112,7 +112,7 @@ public class ServerNonceManager { * This implementation is not smart and just treats nonce group and nonce as random bits. */ // TODO: we could use pure byte arrays, but then we wouldn't be able to use hash map. - private class NonceKey { + private static class NonceKey { private long group; private long nonce; -- 1.8.4.3